From e46d2a8024e7e4b6ee02d313960e89061e740bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Apitzsch?= Date: Tue, 20 Feb 2024 15:40:33 +0100 Subject: [PATCH] core: Use enum class for TestCase::TestDuration and rename it to TestCase:Duration --- CHANGES.md | 1 + doc/manual/source/test-framework.rst | 2 +- src/antenna/test/test-angles.cc | 169 +++++----- src/antenna/test/test-cosine-antenna.cc | 154 ++++----- src/antenna/test/test-degrees-radians.cc | 28 +- src/antenna/test/test-isotropic-antenna.cc | 24 +- src/antenna/test/test-parabolic-antenna.cc | 106 +++---- src/antenna/test/test-uniform-planar-array.cc | 32 +- src/aodv/test/aodv-id-cache-test-suite.cc | 2 +- src/aodv/test/aodv-regression.cc | 7 +- src/aodv/test/aodv-test-suite.cc | 20 +- src/aodv/test/loopback.cc | 2 +- .../test/bulk-send-application-test-suite.cc | 4 +- .../test/three-gpp-http-client-server-test.cc | 6 +- .../test/udp-client-server-test.cc | 8 +- src/brite/test/brite-test-topology.cc | 4 +- .../test/building-position-allocator-test.cc | 4 +- .../buildings-channel-condition-model-test.cc | 2 +- src/buildings/test/buildings-helper-test.cc | 32 +- src/buildings/test/buildings-pathloss-test.cc | 28 +- ...uildings-penetration-loss-pathloss-test.cc | 2 +- .../test/buildings-shadowing-test.cc | 6 +- .../test/outdoor-random-walk-test.cc | 2 +- ...ee-gpp-v2v-channel-condition-model-test.cc | 12 +- src/click/test/ipv4-click-routing-test.cc | 6 +- src/core/model/example-as-test.cc | 2 +- src/core/model/example-as-test.h | 2 +- src/core/model/test.cc | 31 +- src/core/model/test.h | 26 +- .../test/attribute-container-test-suite.cc | 6 +- src/core/test/attribute-test-suite.cc | 30 +- src/core/test/callback-test-suite.cc | 12 +- src/core/test/int64x64-test-suite.cc | 24 +- src/core/test/length-test-suite.cc | 4 +- src/core/test/pair-value-test-suite.cc | 4 +- src/core/test/rng-test-suite.cc | 8 +- src/core/test/simulator-test-suite.cc | 10 +- src/core/test/threaded-test-suite.cc | 2 +- src/core/test/time-test-suite.cc | 6 +- src/core/test/timer-test-suite.cc | 4 +- src/core/test/traced-callback-test-suite.cc | 2 +- src/core/test/tuple-value-test-suite.cc | 2 +- src/core/test/type-id-test-suite.cc | 8 +- src/dsdv/test/dsdv-testcase.cc | 4 +- src/dsr/test/dsr-test-suite.cc | 18 +- .../test/basic-energy-harvester-test.cc | 2 +- src/energy/test/li-ion-energy-source-test.cc | 2 +- src/internet-apps/test/dhcp-test.cc | 2 +- src/internet-apps/test/ipv6-radvd-test.cc | 2 +- src/internet-apps/test/ping-test.cc | 38 +-- .../global-route-manager-impl-test-suite.cc | 2 +- src/internet/test/icmp-test.cc | 8 +- .../test/internet-stack-helper-test-suite.cc | 2 +- .../test/ipv4-address-generator-test-suite.cc | 10 +- .../test/ipv4-address-helper-test-suite.cc | 8 +- src/internet/test/ipv4-deduplication-test.cc | 8 +- src/internet/test/ipv4-forwarding-test.cc | 2 +- src/internet/test/ipv4-fragmentation-test.cc | 4 +- .../test/ipv4-global-routing-test-suite.cc | 16 +- src/internet/test/ipv4-header-test.cc | 2 +- .../test/ipv4-list-routing-test-suite.cc | 4 +- .../test/ipv4-packet-info-tag-test-suite.cc | 2 +- src/internet/test/ipv4-raw-test.cc | 2 +- src/internet/test/ipv4-rip-test.cc | 13 +- .../test/ipv4-static-routing-test-suite.cc | 2 +- src/internet/test/ipv4-test.cc | 2 +- .../test/ipv6-address-duplication-test.cc | 2 +- .../test/ipv6-address-generator-test-suite.cc | 10 +- .../test/ipv6-address-helper-test-suite.cc | 2 +- .../test/ipv6-dual-stack-test-suite.cc | 2 +- .../test/ipv6-extension-header-test-suite.cc | 8 +- src/internet/test/ipv6-forwarding-test.cc | 2 +- src/internet/test/ipv6-fragmentation-test.cc | 2 +- .../test/ipv6-list-routing-test-suite.cc | 4 +- .../test/ipv6-packet-info-tag-test-suite.cc | 2 +- src/internet/test/ipv6-raw-test.cc | 2 +- src/internet/test/ipv6-ripng-test.cc | 12 +- src/internet/test/ipv6-test.cc | 2 +- src/internet/test/neighbor-cache-test.cc | 14 +- src/internet/test/rtt-test.cc | 2 +- .../test/tcp-advertised-window-test.cc | 12 +- src/internet/test/tcp-bbr-test.cc | 12 +- src/internet/test/tcp-bic-test.cc | 22 +- src/internet/test/tcp-bytes-in-flight-test.cc | 8 +- .../test/tcp-classic-recovery-test.cc | 12 +- src/internet/test/tcp-close-test.cc | 4 +- src/internet/test/tcp-cong-avoid-test.cc | 4 +- src/internet/test/tcp-datasentcb-test.cc | 10 +- src/internet/test/tcp-dctcp-test.cc | 8 +- src/internet/test/tcp-ecn-test.cc | 12 +- src/internet/test/tcp-endpoint-bug2211.cc | 6 +- src/internet/test/tcp-fast-retr-test.cc | 2 +- src/internet/test/tcp-header-test.cc | 7 +- src/internet/test/tcp-highspeed-test.cc | 12 +- src/internet/test/tcp-htcp-test.cc | 6 +- src/internet/test/tcp-hybla-test.cc | 12 +- src/internet/test/tcp-illinois-test.cc | 8 +- src/internet/test/tcp-ledbat-test.cc | 8 +- src/internet/test/tcp-linux-reno-test.cc | 16 +- src/internet/test/tcp-loss-test.cc | 4 +- src/internet/test/tcp-lp-test.cc | 6 +- src/internet/test/tcp-option-test.cc | 5 +- src/internet/test/tcp-pacing-test.cc | 12 +- src/internet/test/tcp-pkts-acked-test.cc | 2 +- src/internet/test/tcp-prr-recovery-test.cc | 8 +- src/internet/test/tcp-rate-ops-test.cc | 16 +- src/internet/test/tcp-rto-test.cc | 8 +- src/internet/test/tcp-rtt-estimation.cc | 20 +- src/internet/test/tcp-rx-buffer-test.cc | 2 +- src/internet/test/tcp-sack-permitted-test.cc | 10 +- src/internet/test/tcp-scalable-test.cc | 12 +- src/internet/test/tcp-slow-start-test.cc | 10 +- .../test/tcp-syn-connection-failed-test.cc | 4 +- src/internet/test/tcp-test.cc | 12 +- src/internet/test/tcp-timestamp-test.cc | 21 +- src/internet/test/tcp-tx-buffer-test.cc | 2 +- src/internet/test/tcp-vegas-test.cc | 10 +- src/internet/test/tcp-veno-test.cc | 6 +- src/internet/test/tcp-wscaling-test.cc | 20 +- src/internet/test/tcp-yeah-test.cc | 12 +- src/internet/test/tcp-zero-window-test.cc | 2 +- src/internet/test/udp-test.cc | 8 +- src/lr-wpan/test/lr-wpan-ack-test.cc | 8 +- src/lr-wpan/test/lr-wpan-cca-test.cc | 2 +- src/lr-wpan/test/lr-wpan-collision-test.cc | 2 +- src/lr-wpan/test/lr-wpan-ed-test.cc | 2 +- src/lr-wpan/test/lr-wpan-error-model-test.cc | 4 +- src/lr-wpan/test/lr-wpan-ifs-test.cc | 2 +- src/lr-wpan/test/lr-wpan-mac-test.cc | 6 +- src/lr-wpan/test/lr-wpan-packet-test.cc | 2 +- src/lr-wpan/test/lr-wpan-pd-plme-sap-test.cc | 2 +- .../test/lr-wpan-slotted-csmaca-test.cc | 2 +- .../lr-wpan-spectrum-value-helper-test.cc | 2 +- src/lte/test/epc-test-gtpu.cc | 2 +- src/lte/test/epc-test-s1u-downlink.cc | 20 +- src/lte/test/epc-test-s1u-uplink.cc | 20 +- .../lte-test-aggregation-throughput-scale.cc | 2 +- ...-test-carrier-aggregation-configuration.cc | 4 +- src/lte/test/lte-test-carrier-aggregation.cc | 300 +++++++++++------- src/lte/test/lte-test-cell-selection.cc | 4 +- src/lte/test/lte-test-cqa-ff-mac-scheduler.cc | 32 +- src/lte/test/lte-test-cqi-generation.cc | 18 +- src/lte/test/lte-test-deactivate-bearer.cc | 2 +- .../test/lte-test-downlink-power-control.cc | 30 +- src/lte/test/lte-test-downlink-sinr.cc | 8 +- src/lte/test/lte-test-earfcn.cc | 46 +-- .../test/lte-test-fdbet-ff-mac-scheduler.cc | 45 +-- .../test/lte-test-fdmt-ff-mac-scheduler.cc | 43 +-- .../test/lte-test-fdtbfq-ff-mac-scheduler.cc | 32 +- src/lte/test/lte-test-frequency-reuse.cc | 90 +++--- src/lte/test/lte-test-harq.cc | 4 +- src/lte/test/lte-test-interference-fr.cc | 16 +- src/lte/test/lte-test-interference.cc | 26 +- src/lte/test/lte-test-ipv6-routing.cc | 2 +- src/lte/test/lte-test-link-adaptation.cc | 2 +- src/lte/test/lte-test-mimo.cc | 8 +- src/lte/test/lte-test-pathloss-model.cc | 2 +- src/lte/test/lte-test-pf-ff-mac-scheduler.cc | 55 ++-- src/lte/test/lte-test-phy-error-model.cc | 28 +- src/lte/test/lte-test-primary-cell-change.cc | 32 +- src/lte/test/lte-test-pss-ff-mac-scheduler.cc | 32 +- src/lte/test/lte-test-radio-link-failure.cc | 8 +- src/lte/test/lte-test-rlc-am-e2e.cc | 8 +- src/lte/test/lte-test-rlc-am-transmitter.cc | 11 +- src/lte/test/lte-test-rlc-um-e2e.cc | 6 +- src/lte/test/lte-test-rlc-um-transmitter.cc | 11 +- src/lte/test/lte-test-rr-ff-mac-scheduler.cc | 51 +-- .../test/lte-test-secondary-cell-handover.cc | 4 +- .../test/lte-test-secondary-cell-selection.cc | 8 +- .../test/lte-test-spectrum-value-helper.cc | 64 ++-- .../test/lte-test-tdbet-ff-mac-scheduler.cc | 45 +-- .../test/lte-test-tdmt-ff-mac-scheduler.cc | 43 +-- .../test/lte-test-tdtbfq-ff-mac-scheduler.cc | 32 +- src/lte/test/lte-test-tta-ff-mac-scheduler.cc | 45 +-- src/lte/test/lte-test-ue-measurements.cc | 170 +++++----- src/lte/test/lte-test-uplink-power-control.cc | 7 +- src/lte/test/lte-test-uplink-sinr.cc | 8 +- src/lte/test/test-asn1-encoding.cc | 22 +- src/lte/test/test-epc-tft-classifier.cc | 132 ++++---- src/lte/test/test-lte-antenna.cc | 62 ++-- src/lte/test/test-lte-epc-e2e-data.cc | 20 +- src/lte/test/test-lte-handover-delay.cc | 12 +- src/lte/test/test-lte-handover-failure.cc | 32 +- src/lte/test/test-lte-handover-target.cc | 8 +- src/lte/test/test-lte-rlc-header.cc | 12 +- src/lte/test/test-lte-rrc.cc | 56 ++-- src/lte/test/test-lte-x2-handover-measures.cc | 36 +-- src/lte/test/test-lte-x2-handover.cc | 80 ++--- src/mesh/test/dot11s/dot11s-test-suite.cc | 6 +- src/mesh/test/dot11s/regression.cc | 10 +- src/mesh/test/flame/flame-test-suite.cc | 4 +- src/mesh/test/flame/regression.cc | 2 +- ...h-information-element-vector-test-suite.cc | 2 +- .../test/box-line-intersection-test.cc | 8 +- src/mobility/test/geo-to-cartesian-test.cc | 12 +- src/mobility/test/mobility-test-suite.cc | 8 +- .../test/mobility-trace-test-suite.cc | 2 +- .../test/ns2-mobility-helper-test-suite.cc | 32 +- .../test/rand-cart-around-geo-test.cc | 2 +- .../test/rectangle-closest-border-test.cc | 34 +- ...ate-random-waypoint-mobility-model-test.cc | 2 +- .../test/waypoint-mobility-model-test.cc | 6 +- src/mpi/test/mpi-test-suite.cc | 2 +- src/netanim/test/netanim-test.cc | 4 +- src/network/test/bit-serializer-test.cc | 4 +- src/network/test/buffer-test.cc | 2 +- .../test/drop-tail-queue-test-suite.cc | 2 +- src/network/test/error-model-test-suite.cc | 4 +- src/network/test/ipv6-address-test-suite.cc | 2 +- src/network/test/lollipop-counter-test.cc | 2 +- src/network/test/packet-metadata-test.cc | 2 +- .../test/packet-socket-apps-test-suite.cc | 2 +- src/network/test/packet-test-suite.cc | 4 +- src/network/test/packetbb-test-suite.cc | 110 ++++--- src/network/test/pcap-file-test-suite.cc | 14 +- .../test/sequence-number-test-suite.cc | 2 +- src/network/test/test-data-rate.cc | 4 +- src/nix-vector-routing/test/nix-test.cc | 2 +- src/olsr/test/olsr-header-test-suite.cc | 10 +- .../test/olsr-routing-protocol-test-suite.cc | 2 +- src/olsr/test/regression-test-suite.cc | 6 +- .../test/openflow-switch-test-suite.cc | 2 +- .../test/point-to-point-test.cc | 2 +- .../channel-condition-model-test-suite.cc | 2 +- .../test/itu-r-1411-los-test-suite.cc | 4 +- ...itu-r-1411-nlos-over-rooftop-test-suite.cc | 4 +- .../test/kun-2600-mhz-test-suite.cc | 2 +- .../test/okumura-hata-test-suite.cc | 12 +- ...listic-v2v-channel-condition-model-test.cc | 8 +- .../test/propagation-loss-model-test-suite.cc | 10 +- ...e-gpp-propagation-loss-model-test-suite.cc | 14 +- .../test/sixlowpan-fragmentation-test.cc | 2 +- src/sixlowpan/test/sixlowpan-hc1-test.cc | 2 +- .../test/sixlowpan-iphc-stateful-test.cc | 2 +- src/sixlowpan/test/sixlowpan-iphc-test.cc | 2 +- src/spectrum/test/spectrum-ideal-phy-test.cc | 24 +- .../test/spectrum-interference-test.cc | 24 +- src/spectrum/test/spectrum-value-test.cc | 50 +-- .../test/spectrum-waveform-generator-test.cc | 4 +- .../test/three-gpp-channel-test-suite.cc | 44 +-- .../test/tv-helper-distribution-test.cc | 3 +- .../test/tv-spectrum-transmitter-test.cc | 6 +- src/spectrum/test/two-ray-splm-test-suite.cc | 86 ++--- src/stats/test/average-test-suite.cc | 6 +- .../test/basic-data-calculators-test-suite.cc | 6 +- src/stats/test/double-probe-test-suite.cc | 2 +- src/stats/test/histogram-test-suite.cc | 2 +- src/test/csma-system-test-suite.cc | 16 +- .../ns3tc/fq-cobalt-queue-disc-test-suite.cc | 16 +- .../ns3tc/fq-codel-queue-disc-test-suite.cc | 16 +- .../ns3tc/fq-pie-queue-disc-test-suite.cc | 14 +- .../ns3tc/pfifo-fast-queue-disc-test-suite.cc | 8 +- src/test/ns3tcp/ns3tcp-cubic-test-suite.cc | 8 +- src/test/ns3tcp/ns3tcp-loss-test-suite.cc | 20 +- src/test/ns3tcp/ns3tcp-no-delay-test-suite.cc | 4 +- src/test/ns3tcp/ns3tcp-socket-test-suite.cc | 4 +- src/test/ns3tcp/ns3tcp-state-test-suite.cc | 18 +- .../ns3wifi/wifi-ac-mapping-test-suite.cc | 8 +- src/test/ns3wifi/wifi-issue-211-test-suite.cc | 2 +- .../wifi-msdu-aggregator-test-suite.cc | 2 +- .../traced-callback-typedef-test-suite.cc | 2 +- ...raced-value-callback-typedef-test-suite.cc | 2 +- .../rocketfuel-topology-reader-test-suite.cc | 4 +- .../adaptive-red-queue-disc-test-suite.cc | 2 +- .../test/cobalt-queue-disc-test-suite.cc | 18 +- .../test/codel-queue-disc-test-suite.cc | 24 +- .../test/fifo-queue-disc-test-suite.cc | 2 +- .../test/pie-queue-disc-test-suite.cc | 2 +- .../test/prio-queue-disc-test-suite.cc | 2 +- .../test/queue-disc-traces-test-suite.cc | 2 +- .../test/red-queue-disc-test-suite.cc | 2 +- .../test/tbf-queue-disc-test-suite.cc | 2 +- .../test/tc-flow-control-test-suite.cc | 30 +- src/uan/test/uan-energy-model-test.cc | 4 +- src/uan/test/uan-test.cc | 2 +- src/wifi/test/block-ack-test-suite.cc | 18 +- src/wifi/test/channel-access-manager-test.cc | 6 +- src/wifi/test/inter-bss-test-suite.cc | 6 +- src/wifi/test/power-rate-adaptation-test.cc | 2 +- src/wifi/test/spectrum-wifi-phy-test.cc | 12 +- src/wifi/test/tx-duration-test.cc | 60 ++-- src/wifi/test/wifi-aggregation-test.cc | 14 +- src/wifi/test/wifi-channel-switching-test.cc | 2 +- src/wifi/test/wifi-dynamic-bw-op-test.cc | 6 +- src/wifi/test/wifi-eht-info-elems-test.cc | 32 +- src/wifi/test/wifi-emlsr-test.cc | 23 +- src/wifi/test/wifi-error-rate-models-test.cc | 32 +- src/wifi/test/wifi-ie-fragment-test.cc | 4 +- src/wifi/test/wifi-mac-ofdma-test.cc | 12 +- src/wifi/test/wifi-mac-queue-test.cc | 4 +- src/wifi/test/wifi-mlo-test.cc | 20 +- src/wifi/test/wifi-non-ht-dup-test.cc | 33 +- src/wifi/test/wifi-phy-cca-test.cc | 4 +- src/wifi/test/wifi-phy-mu-mimo-test.cc | 6 +- src/wifi/test/wifi-phy-ofdma-test.cc | 14 +- src/wifi/test/wifi-phy-reception-test.cc | 22 +- src/wifi/test/wifi-phy-thresholds-test.cc | 8 +- src/wifi/test/wifi-primary-channels-test.cc | 14 +- src/wifi/test/wifi-ru-allocation-test.cc | 2 +- src/wifi/test/wifi-test.cc | 36 +-- src/wifi/test/wifi-transmit-mask-test.cc | 54 ++-- src/wifi/test/wifi-txop-test.cc | 4 +- src/wimax/test/mac-messages-test.cc | 2 +- src/wimax/test/phy-test.cc | 4 +- src/wimax/test/qos-test.cc | 4 +- src/wimax/test/ss-mac-test.cc | 4 +- src/wimax/test/wimax-fragmentation-test.cc | 2 +- src/wimax/test/wimax-service-flow-test.cc | 2 +- src/wimax/test/wimax-tlv-test.cc | 4 +- utils/create-module.py | 4 +- 310 files changed, 2506 insertions(+), 2233 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 0098ccd4b..241ede76c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -24,6 +24,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`. * (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/test-framework.rst b/doc/manual/source/test-framework.rst index 79bac86c5..c89eb3c93 100644 --- a/doc/manual/source/test-framework.rst +++ b/doc/manual/source/test-framework.rst @@ -763,7 +763,7 @@ as a ''unit'' test with the display name, ``my-test-suite-name``. MyTestSuite::MyTestSuite() : TestSuite("my-test-suite-name", UNIT) { - AddTestCase(new MyTestCase, TestCase::QUICK); + AddTestCase(new MyTestCase, TestCase::Duration::QUICK); } static MyTestSuite myTestSuite; diff --git a/src/antenna/test/test-angles.cc b/src/antenna/test/test-angles.cc index d84aa441d..53fa89a99 100644 --- a/src/antenna/test/test-angles.cc +++ b/src/antenna/test/test-angles.cc @@ -299,224 +299,231 @@ AnglesTestSuite::AnglesTestSuite() : TestSuite("angles", UNIT) { AddTestCase(new OneVectorConstructorTestCase(Vector(1, 0, 0), Angles(0, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(-1, 0, 0), Angles(M_PI, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(0, 1, 0), Angles(M_PI_2, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(0, -1, 0), Angles(-M_PI_2, M_PI_2)), - TestCase::QUICK); - AddTestCase(new OneVectorConstructorTestCase(Vector(0, 0, 1), Angles(0, 0)), TestCase::QUICK); + TestCase::Duration::QUICK); + AddTestCase(new OneVectorConstructorTestCase(Vector(0, 0, 1), Angles(0, 0)), + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(0, 0, -1), Angles(0, M_PI)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(2, 0, 0), Angles(0, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(-2, 0, 0), Angles(M_PI, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(0, 2, 0), Angles(M_PI_2, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(0, -2, 0), Angles(-M_PI_2, M_PI_2)), - TestCase::QUICK); - AddTestCase(new OneVectorConstructorTestCase(Vector(0, 0, 2), Angles(0, 0)), TestCase::QUICK); + TestCase::Duration::QUICK); + AddTestCase(new OneVectorConstructorTestCase(Vector(0, 0, 2), Angles(0, 0)), + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(0, 0, -2), Angles(0, M_PI)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(1, 0, 1), Angles(0, M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(1, 0, -1), Angles(0, 3 * M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(1, 1, 0), Angles(M_PI_4, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(1, -1, 0), Angles(-M_PI_4, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(-1, 0, 1), Angles(M_PI, M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(-1, 0, -1), Angles(M_PI, 3 * M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(-1, 1, 0), Angles(3 * M_PI_4, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(-1, -1, 0), Angles(-3 * M_PI_4, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(0, 1, 1), Angles(M_PI_2, M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(0, 1, -1), Angles(M_PI_2, 3 * M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(0, -1, 1), Angles(-M_PI_2, M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OneVectorConstructorTestCase(Vector(0, -1, -1), Angles(-M_PI_2, 3 * M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new OneVectorConstructorTestCase(Vector(1, 1, std::sqrt(2)), Angles(M_PI_4, M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new OneVectorConstructorTestCase(Vector(1, 1, -std::sqrt(2)), Angles(M_PI_4, 3 * M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new OneVectorConstructorTestCase(Vector(1, -1, std::sqrt(2)), Angles(-M_PI_4, M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new OneVectorConstructorTestCase(Vector(-1, 1, std::sqrt(2)), Angles(3 * M_PI_4, M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TwoVectorsConstructorTestCase(Vector(1, 0, 0), Vector(0, 0, 0), Angles(0, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TwoVectorsConstructorTestCase(Vector(-1, 0, 0), Vector(0, 0, 0), Angles(M_PI, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TwoVectorsConstructorTestCase(Vector(0, 1, 0), Vector(0, 0, 0), Angles(M_PI_2, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(0, -1, 0), Vector(0, 0, 0), Angles(-M_PI_2, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(0, 0, 1), Vector(0, 0, 0), Angles(0, 0)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TwoVectorsConstructorTestCase(Vector(0, 0, -1), Vector(0, 0, 0), Angles(0, M_PI)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TwoVectorsConstructorTestCase(Vector(2, 0, 0), Vector(0, 0, 0), Angles(0, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TwoVectorsConstructorTestCase(Vector(-2, 0, 0), Vector(0, 0, 0), Angles(M_PI, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TwoVectorsConstructorTestCase(Vector(0, 2, 0), Vector(0, 0, 0), Angles(M_PI_2, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(0, -2, 0), Vector(0, 0, 0), Angles(-M_PI_2, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(0, 0, 2), Vector(0, 0, 0), Angles(0, 0)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TwoVectorsConstructorTestCase(Vector(0, 0, -2), Vector(0, 0, 0), Angles(0, M_PI)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TwoVectorsConstructorTestCase(Vector(1, 0, 1), Vector(0, 0, 0), Angles(0, M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TwoVectorsConstructorTestCase(Vector(1, 0, -1), Vector(0, 0, 0), Angles(0, 3 * M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TwoVectorsConstructorTestCase(Vector(1, 1, 0), Vector(0, 0, 0), Angles(M_PI_4, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(1, -1, 0), Vector(0, 0, 0), Angles(-M_PI_4, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TwoVectorsConstructorTestCase(Vector(-1, 0, 1), Vector(0, 0, 0), Angles(M_PI, M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(-1, 0, -1), Vector(0, 0, 0), Angles(M_PI, 3 * M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(-1, 1, 0), Vector(0, 0, 0), Angles(3 * M_PI_4, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(-1, -1, 0), Vector(0, 0, 0), Angles(-3 * M_PI_4, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TwoVectorsConstructorTestCase(Vector(0, 1, 1), Vector(0, 0, 0), Angles(M_PI_2, M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(0, 1, -1), Vector(0, 0, 0), Angles(M_PI_2, 3 * M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(0, -1, 1), Vector(0, 0, 0), Angles(-M_PI_2, M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(0, -1, -1), Vector(0, 0, 0), Angles(-M_PI_2, 3 * M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(1, 1, std::sqrt(2)), Vector(0, 0, 0), Angles(M_PI_4, M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(1, 1, -std::sqrt(2)), Vector(0, 0, 0), Angles(M_PI_4, 3 * M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(1, -1, std::sqrt(2)), Vector(0, 0, 0), Angles(-M_PI_4, M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(-1, 1, std::sqrt(2)), Vector(0, 0, 0), Angles(3 * M_PI_4, M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TwoVectorsConstructorTestCase(Vector(3, 2, 2), Vector(2, 2, 2), Angles(0, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TwoVectorsConstructorTestCase(Vector(1, 2, 2), Vector(2, 2, 2), Angles(M_PI, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TwoVectorsConstructorTestCase(Vector(2, 3, 2), Vector(2, 2, 2), Angles(M_PI_2, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(-1, 2, 2), Vector(-1, 3, 2), Angles(-M_PI_2, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(4, -2, 7), Vector(4, -2, 6), Angles(0, 0)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TwoVectorsConstructorTestCase(Vector(0, -5, -1), Vector(0, -5, 0), Angles(0, M_PI)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TwoVectorsConstructorTestCase(Vector(-2, 2, -1), Vector(-4, 2, -1), Angles(0, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TwoVectorsConstructorTestCase(Vector(2, 2, 0), Vector(4, 2, 0), Angles(M_PI, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TwoVectorsConstructorTestCase(Vector(-1, 4, 4), Vector(-2, 4, 3), Angles(0, M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(0, -2, -6), Vector(-1, -2, -5), Angles(0, 3 * M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(77, 3, 43), Vector(78, 2, 43), Angles(3 * M_PI_4, M_PI_2)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(24, -2, -6 - std::sqrt(2)), Vector(23, -3, -6), Angles(M_PI_4, 3 * M_PI_4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TwoVectorsConstructorTestCase(Vector(0.5, 11.45, std::sqrt(2) - 1), Vector(-0.5, 12.45, -1), Angles(-M_PI_4, M_PI_4)), - TestCase::QUICK); - AddTestCase(new WrapToRangeTestCase(WrapTo180, -180, 180), TestCase::QUICK); - AddTestCase(new WrapToRangeTestCase(WrapToPi, -M_PI, M_PI), TestCase::QUICK); - AddTestCase(new WrapToRangeTestCase(WrapTo360, 0, 360), TestCase::QUICK); - AddTestCase(new WrapToRangeTestCase(WrapTo2Pi, 0, 2 * M_PI), TestCase::QUICK); - AddTestCase(new WrapToRangeFunctionalTestCase(WrapTo180, -182.2, 177.8), TestCase::QUICK); - AddTestCase(new WrapToRangeFunctionalTestCase(WrapTo180, -179, -179), TestCase::QUICK); - AddTestCase(new WrapToRangeFunctionalTestCase(WrapTo180, 181, -179), TestCase::QUICK); - AddTestCase(new WrapToRangeFunctionalTestCase(WrapTo180, 360.6, 0.6), TestCase::QUICK); - AddTestCase(new WrapToRangeFunctionalTestCase(WrapTo360, -182.8, 177.2), TestCase::QUICK); - AddTestCase(new WrapToRangeFunctionalTestCase(WrapTo360, -179, 181), TestCase::QUICK); - AddTestCase(new WrapToRangeFunctionalTestCase(WrapTo360, 181, 181), TestCase::QUICK); - AddTestCase(new WrapToRangeFunctionalTestCase(WrapTo360, 360.2, 0.2), TestCase::QUICK); + TestCase::Duration::QUICK); + AddTestCase(new WrapToRangeTestCase(WrapTo180, -180, 180), TestCase::Duration::QUICK); + AddTestCase(new WrapToRangeTestCase(WrapToPi, -M_PI, M_PI), TestCase::Duration::QUICK); + AddTestCase(new WrapToRangeTestCase(WrapTo360, 0, 360), TestCase::Duration::QUICK); + AddTestCase(new WrapToRangeTestCase(WrapTo2Pi, 0, 2 * M_PI), TestCase::Duration::QUICK); + AddTestCase(new WrapToRangeFunctionalTestCase(WrapTo180, -182.2, 177.8), + TestCase::Duration::QUICK); + AddTestCase(new WrapToRangeFunctionalTestCase(WrapTo180, -179, -179), + TestCase::Duration::QUICK); + AddTestCase(new WrapToRangeFunctionalTestCase(WrapTo180, 181, -179), TestCase::Duration::QUICK); + AddTestCase(new WrapToRangeFunctionalTestCase(WrapTo180, 360.6, 0.6), + TestCase::Duration::QUICK); + AddTestCase(new WrapToRangeFunctionalTestCase(WrapTo360, -182.8, 177.2), + TestCase::Duration::QUICK); + AddTestCase(new WrapToRangeFunctionalTestCase(WrapTo360, -179, 181), TestCase::Duration::QUICK); + AddTestCase(new WrapToRangeFunctionalTestCase(WrapTo360, 181, 181), TestCase::Duration::QUICK); + AddTestCase(new WrapToRangeFunctionalTestCase(WrapTo360, 360.2, 0.2), + TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/antenna/test/test-cosine-antenna.cc b/src/antenna/test/test-cosine-antenna.cc index 014662aff..5d0b89250 100644 --- a/src/antenna/test/test-cosine-antenna.cc +++ b/src/antenna/test/test-cosine-antenna.cc @@ -166,77 +166,77 @@ CosineAntennaModelTestSuite::CosineAntennaModelTestSuite() 0, 0, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(30), DegreesToRadians(90)), 60, 0, 0, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-30), DegreesToRadians(90)), 60, 0, 0, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-90), DegreesToRadians(90)), 60, 0, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(90), DegreesToRadians(90)), 60, 0, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(100), DegreesToRadians(90)), 60, 0, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(150), DegreesToRadians(90)), 60, 0, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(180), DegreesToRadians(90)), 60, 0, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-100), DegreesToRadians(90)), 60, 0, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-150), DegreesToRadians(90)), 60, 0, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-180), DegreesToRadians(90)), 60, 0, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); // test positive orientation AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(60), DegreesToRadians(90)), @@ -245,77 +245,77 @@ CosineAntennaModelTestSuite::CosineAntennaModelTestSuite() 0, 0, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(90), DegreesToRadians(90)), 60, 60, 0, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(30), DegreesToRadians(90)), 60, 60, 0, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-30), DegreesToRadians(90)), 60, 60, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(150), DegreesToRadians(90)), 60, 60, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(160), DegreesToRadians(90)), 60, 60, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(210), DegreesToRadians(90)), 60, 60, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(240), DegreesToRadians(90)), 60, 60, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-40), DegreesToRadians(90)), 60, 60, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-90), DegreesToRadians(90)), 60, 60, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-120), DegreesToRadians(90)), 60, 60, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); // test negative orientation and different beamwidths // with a 100 deg beamwidth, gain is -20dB at +- 117.47 degrees from boresight @@ -325,21 +325,21 @@ CosineAntennaModelTestSuite::CosineAntennaModelTestSuite() 0, 0, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-100), DegreesToRadians(90)), 100, -150, 0, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-200), DegreesToRadians(90)), 100, -150, 0, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new CosineAntennaModelTestCase(Angles(DegreesToRadians(-32.531), DegreesToRadians(90)), 100, @@ -347,7 +347,7 @@ CosineAntennaModelTestSuite::CosineAntennaModelTestSuite() 0, -20, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new CosineAntennaModelTestCase(Angles(DegreesToRadians(92.531), DegreesToRadians(90)), 100, @@ -355,42 +355,42 @@ CosineAntennaModelTestSuite::CosineAntennaModelTestSuite() 0, -20, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-30), DegreesToRadians(90)), 100, -150, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(0), DegreesToRadians(90)), 100, -150, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(60), DegreesToRadians(90)), 100, -150, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(90), DegreesToRadians(90)), 100, -150, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(30), DegreesToRadians(90)), 100, -150, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); // with a 150 deg beamwidth, gain is -10dB at +- 124.93 degrees from boresight, and -20dB at +- // 155.32 degrees from boresight AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-150), DegreesToRadians(90)), @@ -399,21 +399,21 @@ CosineAntennaModelTestSuite::CosineAntennaModelTestSuite() 0, 0, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(135), DegreesToRadians(90)), 150, -150, 0, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-75), DegreesToRadians(90)), 150, -150, 0, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new CosineAntennaModelTestCase(Angles(DegreesToRadians(85.070), DegreesToRadians(90)), 150, @@ -421,7 +421,7 @@ CosineAntennaModelTestSuite::CosineAntennaModelTestSuite() 0, -10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new CosineAntennaModelTestCase(Angles(DegreesToRadians(-25.070), DegreesToRadians(90)), 150, @@ -429,7 +429,7 @@ CosineAntennaModelTestSuite::CosineAntennaModelTestSuite() 0, -10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new CosineAntennaModelTestCase(Angles(DegreesToRadians(5.3230), DegreesToRadians(90)), 150, @@ -437,7 +437,7 @@ CosineAntennaModelTestSuite::CosineAntennaModelTestSuite() 0, -20, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new CosineAntennaModelTestCase(Angles(DegreesToRadians(54.677), DegreesToRadians(90)), 150, @@ -445,21 +445,21 @@ CosineAntennaModelTestSuite::CosineAntennaModelTestSuite() 0, -20, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(30), DegreesToRadians(90)), 150, -150, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(20), DegreesToRadians(90)), 150, -150, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); // test flat beam, with beamwidth=360 deg AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(0), DegreesToRadians(90)), 360, @@ -467,35 +467,35 @@ CosineAntennaModelTestSuite::CosineAntennaModelTestSuite() 0, 0, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(180), DegreesToRadians(90)), 360, 0, 0, 0, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-180), DegreesToRadians(90)), 360, 0, 0, 0, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(0), DegreesToRadians(0)), 360, 0, 0, 0, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(0), DegreesToRadians(180)), 360, 0, 0, 0, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); // test maxGain AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(0), DegreesToRadians(90)), @@ -504,63 +504,63 @@ CosineAntennaModelTestSuite::CosineAntennaModelTestSuite() 10, 10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(30), DegreesToRadians(90)), 60, 0, 22, 19, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-30), DegreesToRadians(90)), 60, 0, -4, -7, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-90), DegreesToRadians(90)), 60, 0, 10, -10, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(90), DegreesToRadians(90)), 60, 0, -20, -40, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(100), DegreesToRadians(90)), 60, 0, 40, 20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-150), DegreesToRadians(90)), 100, -150, 2, 2, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-100), DegreesToRadians(90)), 100, -150, 4, 1, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-200), DegreesToRadians(90)), 100, -150, -1, -4, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); // test elevation angle AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(0), DegreesToRadians(60)), @@ -569,56 +569,56 @@ CosineAntennaModelTestSuite::CosineAntennaModelTestSuite() 0, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(30), DegreesToRadians(60)), 60, 0, 0, -6, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-30), DegreesToRadians(60)), 60, 0, 0, -6, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-90), DegreesToRadians(60)), 60, 0, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-180), DegreesToRadians(60)), 60, 0, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(60), DegreesToRadians(120)), 60, 60, 0, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(90), DegreesToRadians(120)), 60, 60, 0, -6, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(30), DegreesToRadians(120)), 60, 60, 0, -6, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new CosineAntennaModelTestCase(Angles(DegreesToRadians(-120), DegreesToRadians(120)), 60, @@ -626,7 +626,7 @@ CosineAntennaModelTestSuite::CosineAntennaModelTestSuite() 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new CosineAntennaModelTestCase(Angles(DegreesToRadians(-150), DegreesToRadians(140)), 100, @@ -634,7 +634,7 @@ CosineAntennaModelTestSuite::CosineAntennaModelTestSuite() 0, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new CosineAntennaModelTestCase(Angles(DegreesToRadians(-100), DegreesToRadians(140)), 100, @@ -642,7 +642,7 @@ CosineAntennaModelTestSuite::CosineAntennaModelTestSuite() 0, -6, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new CosineAntennaModelTestCase(Angles(DegreesToRadians(-200), DegreesToRadians(140)), 100, @@ -650,77 +650,77 @@ CosineAntennaModelTestSuite::CosineAntennaModelTestSuite() 0, -6, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-30), DegreesToRadians(140)), 100, -150, 0, -20, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(0), DegreesToRadians(60)), 60, 0, 10, 7, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(30), DegreesToRadians(60)), 60, 0, 22, 16, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-30), DegreesToRadians(60)), 60, 0, -4, -10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-90), DegreesToRadians(60)), 60, 0, 10, -13, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(90), DegreesToRadians(60)), 60, 0, -20, -43, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(100), DegreesToRadians(60)), 60, 0, 40, 17, LESSTHAN), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-150), DegreesToRadians(40)), 100, -150, 2, -1, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-100), DegreesToRadians(40)), 100, -150, 4, -2, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CosineAntennaModelTestCase(Angles(DegreesToRadians(-200), DegreesToRadians(40)), 100, -150, -1, -7, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/antenna/test/test-degrees-radians.cc b/src/antenna/test/test-degrees-radians.cc index 6643f3ffe..649be1a81 100644 --- a/src/antenna/test/test-degrees-radians.cc +++ b/src/antenna/test/test-degrees-radians.cc @@ -140,21 +140,21 @@ class DegreesRadiansTestSuite : public TestSuite DegreesRadiansTestSuite::DegreesRadiansTestSuite() : TestSuite("degrees-radians", UNIT) { - AddTestCase(new DegreesToRadiansTestCase(0, 0), TestCase::QUICK); - AddTestCase(new DegreesToRadiansTestCase(90, M_PI_2), TestCase::QUICK); - AddTestCase(new DegreesToRadiansTestCase(180, M_PI), TestCase::QUICK); - AddTestCase(new DegreesToRadiansTestCase(270, M_PI + M_PI_2), TestCase::QUICK); - AddTestCase(new DegreesToRadiansTestCase(360, M_PI + M_PI), TestCase::QUICK); - AddTestCase(new DegreesToRadiansTestCase(-90, -M_PI_2), TestCase::QUICK); - AddTestCase(new DegreesToRadiansTestCase(810, 4.5 * M_PI), TestCase::QUICK); + AddTestCase(new DegreesToRadiansTestCase(0, 0), TestCase::Duration::QUICK); + AddTestCase(new DegreesToRadiansTestCase(90, M_PI_2), TestCase::Duration::QUICK); + AddTestCase(new DegreesToRadiansTestCase(180, M_PI), TestCase::Duration::QUICK); + AddTestCase(new DegreesToRadiansTestCase(270, M_PI + M_PI_2), TestCase::Duration::QUICK); + AddTestCase(new DegreesToRadiansTestCase(360, M_PI + M_PI), TestCase::Duration::QUICK); + AddTestCase(new DegreesToRadiansTestCase(-90, -M_PI_2), TestCase::Duration::QUICK); + AddTestCase(new DegreesToRadiansTestCase(810, 4.5 * M_PI), TestCase::Duration::QUICK); - AddTestCase(new RadiansToDegreesTestCase(0, 0), TestCase::QUICK); - AddTestCase(new RadiansToDegreesTestCase(M_PI_2, 90), TestCase::QUICK); - AddTestCase(new RadiansToDegreesTestCase(M_PI, 180), TestCase::QUICK); - AddTestCase(new RadiansToDegreesTestCase(M_PI + M_PI_2, 270), TestCase::QUICK); - AddTestCase(new RadiansToDegreesTestCase(M_PI + M_PI, 360), TestCase::QUICK); - AddTestCase(new RadiansToDegreesTestCase(-M_PI_2, -90), TestCase::QUICK); - AddTestCase(new RadiansToDegreesTestCase(4.5 * M_PI, 810), TestCase::QUICK); + AddTestCase(new RadiansToDegreesTestCase(0, 0), TestCase::Duration::QUICK); + AddTestCase(new RadiansToDegreesTestCase(M_PI_2, 90), TestCase::Duration::QUICK); + AddTestCase(new RadiansToDegreesTestCase(M_PI, 180), TestCase::Duration::QUICK); + AddTestCase(new RadiansToDegreesTestCase(M_PI + M_PI_2, 270), TestCase::Duration::QUICK); + AddTestCase(new RadiansToDegreesTestCase(M_PI + M_PI, 360), TestCase::Duration::QUICK); + AddTestCase(new RadiansToDegreesTestCase(-M_PI_2, -90), TestCase::Duration::QUICK); + AddTestCase(new RadiansToDegreesTestCase(4.5 * M_PI, 810), TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/antenna/test/test-isotropic-antenna.cc b/src/antenna/test/test-isotropic-antenna.cc index 1c4ba29fc..96ffe443d 100644 --- a/src/antenna/test/test-isotropic-antenna.cc +++ b/src/antenna/test/test-isotropic-antenna.cc @@ -96,15 +96,21 @@ class IsotropicAntennaModelTestSuite : public TestSuite IsotropicAntennaModelTestSuite::IsotropicAntennaModelTestSuite() : TestSuite("isotropic-antenna-model", UNIT) { - AddTestCase(new IsotropicAntennaModelTestCase(Angles(0, 0), 0.0), TestCase::QUICK); - AddTestCase(new IsotropicAntennaModelTestCase(Angles(0, M_PI), 0.0), TestCase::QUICK); - AddTestCase(new IsotropicAntennaModelTestCase(Angles(0, M_PI_2), 0.0), TestCase::QUICK); - AddTestCase(new IsotropicAntennaModelTestCase(Angles(M_PI, 0), 0.0), TestCase::QUICK); - AddTestCase(new IsotropicAntennaModelTestCase(Angles(M_PI, M_PI), 0.0), TestCase::QUICK); - AddTestCase(new IsotropicAntennaModelTestCase(Angles(M_PI, M_PI_2), 0.0), TestCase::QUICK); - AddTestCase(new IsotropicAntennaModelTestCase(Angles(M_PI_2, 0), 0.0), TestCase::QUICK); - AddTestCase(new IsotropicAntennaModelTestCase(Angles(M_PI_2, M_PI), 0.0), TestCase::QUICK); - AddTestCase(new IsotropicAntennaModelTestCase(Angles(M_PI_2, M_PI_2), 0.0), TestCase::QUICK); + AddTestCase(new IsotropicAntennaModelTestCase(Angles(0, 0), 0.0), TestCase::Duration::QUICK); + AddTestCase(new IsotropicAntennaModelTestCase(Angles(0, M_PI), 0.0), TestCase::Duration::QUICK); + AddTestCase(new IsotropicAntennaModelTestCase(Angles(0, M_PI_2), 0.0), + TestCase::Duration::QUICK); + AddTestCase(new IsotropicAntennaModelTestCase(Angles(M_PI, 0), 0.0), TestCase::Duration::QUICK); + AddTestCase(new IsotropicAntennaModelTestCase(Angles(M_PI, M_PI), 0.0), + TestCase::Duration::QUICK); + AddTestCase(new IsotropicAntennaModelTestCase(Angles(M_PI, M_PI_2), 0.0), + TestCase::Duration::QUICK); + AddTestCase(new IsotropicAntennaModelTestCase(Angles(M_PI_2, 0), 0.0), + TestCase::Duration::QUICK); + AddTestCase(new IsotropicAntennaModelTestCase(Angles(M_PI_2, M_PI), 0.0), + TestCase::Duration::QUICK); + AddTestCase(new IsotropicAntennaModelTestCase(Angles(M_PI_2, M_PI_2), 0.0), + TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/antenna/test/test-parabolic-antenna.cc b/src/antenna/test/test-parabolic-antenna.cc index b04347188..f6f401153 100644 --- a/src/antenna/test/test-parabolic-antenna.cc +++ b/src/antenna/test/test-parabolic-antenna.cc @@ -166,7 +166,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, 0, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(30), DegreesToRadians(90)), 60, @@ -174,7 +174,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-30), DegreesToRadians(90)), 60, @@ -182,7 +182,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-90), DegreesToRadians(90)), 60, @@ -190,7 +190,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, -20, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(90), DegreesToRadians(90)), 60, @@ -198,7 +198,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, -20, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(100), DegreesToRadians(90)), 60, @@ -206,7 +206,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, -20, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(150), DegreesToRadians(90)), 60, @@ -214,7 +214,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, -20, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(180), DegreesToRadians(90)), 60, @@ -222,7 +222,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, -20, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-100), DegreesToRadians(90)), 60, @@ -230,7 +230,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, -20, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-150), DegreesToRadians(90)), 60, @@ -238,7 +238,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, -20, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-180), DegreesToRadians(90)), 60, @@ -246,7 +246,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, -20, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); // with a 60 deg beamwidth, gain is -10dB at +-54.772 degrees from boresight // test positive orientation @@ -257,7 +257,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, 0, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(90), DegreesToRadians(90)), 60, @@ -265,7 +265,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(30), DegreesToRadians(90)), 60, @@ -273,7 +273,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-30), DegreesToRadians(90)), 60, @@ -281,7 +281,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(150), DegreesToRadians(90)), 60, @@ -289,7 +289,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(160), DegreesToRadians(90)), 60, @@ -297,7 +297,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(210), DegreesToRadians(90)), 60, @@ -305,7 +305,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(240), DegreesToRadians(90)), 60, @@ -313,7 +313,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-40), DegreesToRadians(90)), 60, @@ -321,7 +321,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-90), DegreesToRadians(90)), 60, @@ -329,7 +329,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-120), DegreesToRadians(90)), 60, @@ -337,7 +337,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); // test negative orientation and different beamwidths // with a 80 deg beamwidth, gain is -20dB at +- 73.030 degrees from boresight @@ -348,7 +348,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, 0, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-110), DegreesToRadians(90)), 80, @@ -356,7 +356,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-190), DegreesToRadians(90)), 80, @@ -364,7 +364,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-70), DegreesToRadians(90)), 80, @@ -372,7 +372,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(92), DegreesToRadians(90)), 80, @@ -380,7 +380,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-30), DegreesToRadians(90)), 80, @@ -388,14 +388,14 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(0), DegreesToRadians(90)), 80, -150, 10, -10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(60), DegreesToRadians(90)), 80, @@ -403,7 +403,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(90), DegreesToRadians(90)), 80, @@ -411,7 +411,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(30), DegreesToRadians(90)), 80, @@ -419,7 +419,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); // test elevation angle AddTestCase(new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(0), DegreesToRadians(88)), @@ -428,7 +428,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, 0, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(30), DegreesToRadians(88)), 60, @@ -436,7 +436,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-30), DegreesToRadians(88)), 60, @@ -444,7 +444,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-90), DegreesToRadians(88)), 60, @@ -452,7 +452,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, -20, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-180), DegreesToRadians(88)), 60, @@ -460,7 +460,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, -20, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(60), DegreesToRadians(93)), 60, @@ -468,7 +468,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, 0, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(90), DegreesToRadians(93)), 60, @@ -476,7 +476,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(30), DegreesToRadians(93)), 60, @@ -484,7 +484,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-120), DegreesToRadians(93)), 60, @@ -492,7 +492,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, -20, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-150), DegreesToRadians(93)), 100, @@ -500,7 +500,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, 0, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-100), DegreesToRadians(93)), 100, @@ -508,7 +508,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-200), DegreesToRadians(93)), 100, @@ -516,7 +516,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-30), DegreesToRadians(93)), 100, @@ -524,7 +524,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(90), DegreesToRadians(80.5)), 100, @@ -532,7 +532,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 10, -10, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(0), DegreesToRadians(80.5)), 60, @@ -540,7 +540,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, 0, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(30), DegreesToRadians(80.5)), 60, @@ -548,7 +548,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-30), DegreesToRadians(80.5)), 60, @@ -556,7 +556,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(100), DegreesToRadians(80.5)), 60, @@ -564,7 +564,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 20, -20, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-150), DegreesToRadians(80.5)), 100, @@ -572,7 +572,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 30, 0, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-100), DegreesToRadians(80.5)), 100, @@ -580,7 +580,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 30, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new ParabolicAntennaModelTestCase(Angles(DegreesToRadians(-200), DegreesToRadians(80.5)), 100, @@ -588,7 +588,7 @@ ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() 30, -3, EQUAL), - TestCase::QUICK); + TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/antenna/test/test-uniform-planar-array.cc b/src/antenna/test/test-uniform-planar-array.cc index a47135061..9356b4ec1 100644 --- a/src/antenna/test/test-uniform-planar-array.cc +++ b/src/antenna/test/test-uniform-planar-array.cc @@ -233,7 +233,7 @@ UniformPlanarArrayTestSuite::UniformPlanarArrayTestSuite() DegreesToRadians(0), Angles(DegreesToRadians(0), DegreesToRadians(90)), 0.0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new UniformPlanarArrayTestCase(tgpp, 1, 1, @@ -243,7 +243,7 @@ UniformPlanarArrayTestSuite::UniformPlanarArrayTestSuite() DegreesToRadians(0), Angles(DegreesToRadians(0), DegreesToRadians(90)), 8.0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new UniformPlanarArrayTestCase(tgpp, 1, 1, @@ -253,7 +253,7 @@ UniformPlanarArrayTestSuite::UniformPlanarArrayTestSuite() DegreesToRadians(0), Angles(DegreesToRadians(90), DegreesToRadians(90)), 8.0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new UniformPlanarArrayTestCase(tgpp, 1, 1, @@ -263,7 +263,7 @@ UniformPlanarArrayTestSuite::UniformPlanarArrayTestSuite() DegreesToRadians(0), Angles(DegreesToRadians(-90), DegreesToRadians(90)), 8.0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new UniformPlanarArrayTestCase(tgpp, 1, 1, @@ -273,7 +273,7 @@ UniformPlanarArrayTestSuite::UniformPlanarArrayTestSuite() DegreesToRadians(0), Angles(DegreesToRadians(180), DegreesToRadians(90)), 8.0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new UniformPlanarArrayTestCase(tgpp, 1, 1, @@ -283,7 +283,7 @@ UniformPlanarArrayTestSuite::UniformPlanarArrayTestSuite() DegreesToRadians(0), Angles(DegreesToRadians(-180), DegreesToRadians(90)), 8.0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new UniformPlanarArrayTestCase(tgpp, 1, 1, @@ -293,7 +293,7 @@ UniformPlanarArrayTestSuite::UniformPlanarArrayTestSuite() DegreesToRadians(45), Angles(DegreesToRadians(0), DegreesToRadians(135)), 8.0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new UniformPlanarArrayTestCase(tgpp, 1, 1, @@ -303,7 +303,7 @@ UniformPlanarArrayTestSuite::UniformPlanarArrayTestSuite() DegreesToRadians(-45), Angles(DegreesToRadians(0), DegreesToRadians(45)), 8.0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new UniformPlanarArrayTestCase(tgpp, 1, 1, @@ -313,7 +313,7 @@ UniformPlanarArrayTestSuite::UniformPlanarArrayTestSuite() DegreesToRadians(90), Angles(DegreesToRadians(0), DegreesToRadians(180)), 8.0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new UniformPlanarArrayTestCase(tgpp, 1, 1, @@ -323,7 +323,7 @@ UniformPlanarArrayTestSuite::UniformPlanarArrayTestSuite() DegreesToRadians(-90), Angles(DegreesToRadians(0), DegreesToRadians(0)), 8.0), - TestCase::QUICK); + TestCase::Duration::QUICK); // linear array AddTestCase(new UniformPlanarArrayTestCase(tgpp, @@ -335,7 +335,7 @@ UniformPlanarArrayTestSuite::UniformPlanarArrayTestSuite() DegreesToRadians(0), Angles(DegreesToRadians(0), DegreesToRadians(90)), 18.0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new UniformPlanarArrayTestCase(tgpp, 10, 1, @@ -345,7 +345,7 @@ UniformPlanarArrayTestSuite::UniformPlanarArrayTestSuite() DegreesToRadians(0), Angles(DegreesToRadians(90), DegreesToRadians(90)), 18.0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new UniformPlanarArrayTestCase(tgpp, 10, 1, @@ -355,7 +355,7 @@ UniformPlanarArrayTestSuite::UniformPlanarArrayTestSuite() DegreesToRadians(45), Angles(DegreesToRadians(0), DegreesToRadians(135)), 18.0), - TestCase::QUICK); + TestCase::Duration::QUICK); // planar array AddTestCase(new UniformPlanarArrayTestCase(tgpp, @@ -367,7 +367,7 @@ UniformPlanarArrayTestSuite::UniformPlanarArrayTestSuite() DegreesToRadians(0), Angles(DegreesToRadians(0), DegreesToRadians(90)), 28.0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new UniformPlanarArrayTestCase(tgpp, 10, 10, @@ -377,7 +377,7 @@ UniformPlanarArrayTestSuite::UniformPlanarArrayTestSuite() DegreesToRadians(0), Angles(DegreesToRadians(90), DegreesToRadians(90)), 28.0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new UniformPlanarArrayTestCase(tgpp, 10, 10, @@ -387,7 +387,7 @@ UniformPlanarArrayTestSuite::UniformPlanarArrayTestSuite() DegreesToRadians(45), Angles(DegreesToRadians(0), DegreesToRadians(135)), 28.0), - TestCase::QUICK); + TestCase::Duration::QUICK); } static UniformPlanarArrayTestSuite staticUniformPlanarArrayTestSuiteInstance; diff --git a/src/aodv/test/aodv-id-cache-test-suite.cc b/src/aodv/test/aodv-id-cache-test-suite.cc index 780f23fe1..2b7ee0f3b 100644 --- a/src/aodv/test/aodv-id-cache-test-suite.cc +++ b/src/aodv/test/aodv-id-cache-test-suite.cc @@ -120,7 +120,7 @@ class IdCacheTestSuite : public TestSuite IdCacheTestSuite() : TestSuite("aodv-routing-id-cache", UNIT) { - AddTestCase(new IdCacheTest, TestCase::QUICK); + AddTestCase(new IdCacheTest, TestCase::Duration::QUICK); } } g_idCacheTestSuite; ///< the test suite diff --git a/src/aodv/test/aodv-regression.cc b/src/aodv/test/aodv-regression.cc index bad3baa27..713441d1f 100644 --- a/src/aodv/test/aodv-regression.cc +++ b/src/aodv/test/aodv-regression.cc @@ -56,13 +56,14 @@ class AodvRegressionTestSuite : public TestSuite { SetDataDir(NS_TEST_SOURCEDIR); // General RREQ-RREP-RRER test case - AddTestCase(new ChainRegressionTest("aodv-chain-regression-test"), TestCase::QUICK); + AddTestCase(new ChainRegressionTest("aodv-chain-regression-test"), + TestCase::Duration::QUICK); // \bugid{606} test case, should crash if bug is not fixed AddTestCase(new ChainRegressionTest("bug-606-test", Seconds(10), 3, Seconds(1)), - TestCase::QUICK); + TestCase::Duration::QUICK); // \bugid{772} UDP test case AddTestCase(new Bug772ChainTest("udp-chain-test", "ns3::UdpSocketFactory", Seconds(3), 10), - TestCase::QUICK); + TestCase::Duration::QUICK); } } g_aodvRegressionTestSuite; ///< the test suite diff --git a/src/aodv/test/aodv-test-suite.cc b/src/aodv/test/aodv-test-suite.cc index 35e8cc9ff..eb5d411fb 100644 --- a/src/aodv/test/aodv-test-suite.cc +++ b/src/aodv/test/aodv-test-suite.cc @@ -741,16 +741,16 @@ class AodvTestSuite : public TestSuite AodvTestSuite() : TestSuite("routing-aodv", UNIT) { - AddTestCase(new NeighborTest, TestCase::QUICK); - AddTestCase(new TypeHeaderTest, TestCase::QUICK); - AddTestCase(new RreqHeaderTest, TestCase::QUICK); - AddTestCase(new RrepHeaderTest, TestCase::QUICK); - AddTestCase(new RrepAckHeaderTest, TestCase::QUICK); - AddTestCase(new RerrHeaderTest, TestCase::QUICK); - AddTestCase(new QueueEntryTest, TestCase::QUICK); - AddTestCase(new AodvRqueueTest, TestCase::QUICK); - AddTestCase(new AodvRtableEntryTest, TestCase::QUICK); - AddTestCase(new AodvRtableTest, TestCase::QUICK); + AddTestCase(new NeighborTest, TestCase::Duration::QUICK); + AddTestCase(new TypeHeaderTest, TestCase::Duration::QUICK); + AddTestCase(new RreqHeaderTest, TestCase::Duration::QUICK); + AddTestCase(new RrepHeaderTest, TestCase::Duration::QUICK); + AddTestCase(new RrepAckHeaderTest, TestCase::Duration::QUICK); + AddTestCase(new RerrHeaderTest, TestCase::Duration::QUICK); + AddTestCase(new QueueEntryTest, TestCase::Duration::QUICK); + AddTestCase(new AodvRqueueTest, TestCase::Duration::QUICK); + AddTestCase(new AodvRtableEntryTest, TestCase::Duration::QUICK); + AddTestCase(new AodvRtableTest, TestCase::Duration::QUICK); } } g_aodvTestSuite; ///< the test suite diff --git a/src/aodv/test/loopback.cc b/src/aodv/test/loopback.cc index b4beff597..837795524 100644 --- a/src/aodv/test/loopback.cc +++ b/src/aodv/test/loopback.cc @@ -201,7 +201,7 @@ class AodvLoopbackTestSuite : public TestSuite { SetDataDir(NS_TEST_SOURCEDIR); // UDP Echo loopback test case - AddTestCase(new LoopbackTestCase(), TestCase::QUICK); + AddTestCase(new LoopbackTestCase(), TestCase::Duration::QUICK); } } g_aodvLoopbackTestSuite; ///< the test suite diff --git a/src/applications/test/bulk-send-application-test-suite.cc b/src/applications/test/bulk-send-application-test-suite.cc index 769742a73..5d9990448 100644 --- a/src/applications/test/bulk-send-application-test-suite.cc +++ b/src/applications/test/bulk-send-application-test-suite.cc @@ -276,8 +276,8 @@ class BulkSendTestSuite : public TestSuite BulkSendTestSuite::BulkSendTestSuite() : TestSuite("bulk-send-application", UNIT) { - AddTestCase(new BulkSendBasicTestCase, TestCase::QUICK); - AddTestCase(new BulkSendSeqTsSizeTestCase, TestCase::QUICK); + AddTestCase(new BulkSendBasicTestCase, TestCase::Duration::QUICK); + AddTestCase(new BulkSendSeqTsSizeTestCase, TestCase::Duration::QUICK); } static BulkSendTestSuite g_bulkSendTestSuite; //!< Static variable for test initialization 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 7337e23e8..ff9801a44 100644 --- a/src/applications/test/three-gpp-http-client-server-test.cc +++ b/src/applications/test/three-gpp-http-client-server-test.cc @@ -873,14 +873,14 @@ class ThreeGppHttpClientServerTestSuite : public TestSuite } // Assign higher fullness for tests with higher RngRun. - TestCase::TestDuration testDuration = TestCase::QUICK; + TestCase::Duration testDuration = TestCase::Duration::QUICK; if (rngRun > 20) { - testDuration = TestCase::EXTENSIVE; + testDuration = TestCase::Duration::EXTENSIVE; } if (rngRun > 50) { - testDuration = TestCase::TAKES_FOREVER; + testDuration = TestCase::Duration::TAKES_FOREVER; } AddTestCase(new ThreeGppHttpObjectTestCase(name.str(), diff --git a/src/applications/test/udp-client-server-test.cc b/src/applications/test/udp-client-server-test.cc index 36fecb721..aaf30ef37 100644 --- a/src/applications/test/udp-client-server-test.cc +++ b/src/applications/test/udp-client-server-test.cc @@ -361,10 +361,10 @@ class UdpClientServerTestSuite : public TestSuite UdpClientServerTestSuite::UdpClientServerTestSuite() : TestSuite("udp-client-server", UNIT) { - AddTestCase(new UdpTraceClientServerTestCase, TestCase::QUICK); - AddTestCase(new UdpClientServerTestCase, TestCase::QUICK); - AddTestCase(new PacketLossCounterTestCase, TestCase::QUICK); - AddTestCase(new UdpEchoClientSetFillTestCase, TestCase::QUICK); + AddTestCase(new UdpTraceClientServerTestCase, TestCase::Duration::QUICK); + AddTestCase(new UdpClientServerTestCase, TestCase::Duration::QUICK); + AddTestCase(new PacketLossCounterTestCase, TestCase::Duration::QUICK); + AddTestCase(new UdpEchoClientSetFillTestCase, TestCase::Duration::QUICK); } static UdpClientServerTestSuite diff --git a/src/brite/test/brite-test-topology.cc b/src/brite/test/brite-test-topology.cc index 022d61912..7809f4572 100644 --- a/src/brite/test/brite-test-topology.cc +++ b/src/brite/test/brite-test-topology.cc @@ -217,8 +217,8 @@ class BriteTestSuite : public TestSuite BriteTestSuite() : TestSuite("brite-testing", UNIT) { - AddTestCase(new BriteTopologyStructureTestCase, TestCase::QUICK); - AddTestCase(new BriteTopologyFunctionTestCase, TestCase::QUICK); + 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 8b186b4ef..5c8bfa14d 100644 --- a/src/buildings/test/building-position-allocator-test.cc +++ b/src/buildings/test/building-position-allocator-test.cc @@ -239,8 +239,8 @@ BuildingPositionAllocatorTestSuite::BuildingPositionAllocatorTestSuite() { NS_LOG_FUNCTION(this); - AddTestCase(new RandomRoomPositionAllocatorTestCase, TestCase::QUICK); - AddTestCase(new SameRoomPositionAllocatorTestCase, TestCase::QUICK); + AddTestCase(new RandomRoomPositionAllocatorTestCase, TestCase::Duration::QUICK); + AddTestCase(new SameRoomPositionAllocatorTestCase, TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/buildings/test/buildings-channel-condition-model-test.cc b/src/buildings/test/buildings-channel-condition-model-test.cc index 0e8604fa4..35afa203e 100644 --- a/src/buildings/test/buildings-channel-condition-model-test.cc +++ b/src/buildings/test/buildings-channel-condition-model-test.cc @@ -158,7 +158,7 @@ class BuildingsChannelConditionModelsTestSuite : public TestSuite BuildingsChannelConditionModelsTestSuite::BuildingsChannelConditionModelsTestSuite() : TestSuite("buildings-channel-condition-model", UNIT) { - AddTestCase(new BuildingsChannelConditionModelTestCase, TestCase::QUICK); + AddTestCase(new BuildingsChannelConditionModelTestCase, TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/buildings/test/buildings-helper-test.cc b/src/buildings/test/buildings-helper-test.cc index 3a5f91d8a..8e80510e3 100644 --- a/src/buildings/test/buildings-helper-test.cc +++ b/src/buildings/test/buildings-helper-test.cc @@ -227,25 +227,25 @@ BuildingsHelperTestSuite::BuildingsHelperTestSuite() p1.rx = 1; p1.ry = 1; p1.fn = 1; - AddTestCase(new BuildingsHelperOneTestCase(p1, b1), TestCase::QUICK); + AddTestCase(new BuildingsHelperOneTestCase(p1, b1), TestCase::Duration::QUICK); Vector vp2(1.5, 0.5, 0.5); PositionInBuilding p2; p2.pos = vp2; p2.indoor = false; - AddTestCase(new BuildingsHelperOneTestCase(p2, b1), TestCase::QUICK); + AddTestCase(new BuildingsHelperOneTestCase(p2, b1), TestCase::Duration::QUICK); Vector vp3(1.5, 2.5, 0.5); PositionInBuilding p3; p3.pos = vp3; p3.indoor = false; - AddTestCase(new BuildingsHelperOneTestCase(p3, b1), TestCase::QUICK); + AddTestCase(new BuildingsHelperOneTestCase(p3, b1), TestCase::Duration::QUICK); Vector vp4(1.5, 1.5, 5); PositionInBuilding p4; p4.pos = vp4; p4.indoor = false; - AddTestCase(new BuildingsHelperOneTestCase(p4, b1), TestCase::QUICK); + AddTestCase(new BuildingsHelperOneTestCase(p4, b1), TestCase::Duration::QUICK); Vector vp5(2.5, 1.6, 3.5); PositionInBuilding p5; @@ -255,31 +255,31 @@ BuildingsHelperTestSuite::BuildingsHelperTestSuite() p5.rx = 1; p5.ry = 1; p5.fn = 1; - AddTestCase(new BuildingsHelperOneTestCase(p5, b1), TestCase::QUICK); + AddTestCase(new BuildingsHelperOneTestCase(p5, b1), TestCase::Duration::QUICK); Vector vp6(0.9999, 1.5, 1.5); PositionInBuilding p6; p6.pos = vp6; p6.indoor = false; - AddTestCase(new BuildingsHelperOneTestCase(p6, b1), TestCase::QUICK); + AddTestCase(new BuildingsHelperOneTestCase(p6, b1), TestCase::Duration::QUICK); Vector vp7(3.0001, 1.5, 2.5); PositionInBuilding p7; p7.pos = vp7; p7.indoor = false; - AddTestCase(new BuildingsHelperOneTestCase(p7, b1), TestCase::QUICK); + AddTestCase(new BuildingsHelperOneTestCase(p7, b1), TestCase::Duration::QUICK); Vector vp8(1.001, 1.001, -0.01); PositionInBuilding p8; p8.pos = vp8; p8.indoor = false; - AddTestCase(new BuildingsHelperOneTestCase(p8, b1), TestCase::QUICK); + AddTestCase(new BuildingsHelperOneTestCase(p8, b1), TestCase::Duration::QUICK); Vector vp9(1.5, 1.5, 4.001); PositionInBuilding p9; p9.pos = vp9; p9.indoor = false; - AddTestCase(new BuildingsHelperOneTestCase(p9, b1), TestCase::QUICK); + AddTestCase(new BuildingsHelperOneTestCase(p9, b1), TestCase::Duration::QUICK); BuildingData b2; b2.xmin = -1; @@ -300,7 +300,7 @@ BuildingsHelperTestSuite::BuildingsHelperTestSuite() q1.rx = 1; q1.ry = 2; q1.fn = 3; - AddTestCase(new BuildingsHelperOneTestCase(q1, b2), TestCase::QUICK); + AddTestCase(new BuildingsHelperOneTestCase(q1, b2), TestCase::Duration::QUICK); Vector vq2(0.2, 0.3, 0.2); PositionInBuilding q2; @@ -310,37 +310,37 @@ BuildingsHelperTestSuite::BuildingsHelperTestSuite() q2.rx = 3; q2.ry = 5; q2.fn = 1; - AddTestCase(new BuildingsHelperOneTestCase(q2, b2), TestCase::QUICK); + AddTestCase(new BuildingsHelperOneTestCase(q2, b2), TestCase::Duration::QUICK); Vector vq3(0.6, -1.75, 1.5); PositionInBuilding q3; q3.pos = vq3; q3.indoor = false; - AddTestCase(new BuildingsHelperOneTestCase(q3, b2), TestCase::QUICK); + AddTestCase(new BuildingsHelperOneTestCase(q3, b2), TestCase::Duration::QUICK); Vector vq4(-1.01, 0.3, 1.99); PositionInBuilding q4; q4.pos = vq4; q4.indoor = false; - AddTestCase(new BuildingsHelperOneTestCase(q4, b2), TestCase::QUICK); + AddTestCase(new BuildingsHelperOneTestCase(q4, b2), TestCase::Duration::QUICK); Vector vq5(-0.8, 0.7, 0.01); PositionInBuilding q5; q5.pos = vq5; q5.indoor = false; - AddTestCase(new BuildingsHelperOneTestCase(q5, b2), TestCase::QUICK); + AddTestCase(new BuildingsHelperOneTestCase(q5, b2), TestCase::Duration::QUICK); Vector vq6(0.2, 0.3, -0.2); PositionInBuilding q6; q6.pos = vq6; q6.indoor = false; - AddTestCase(new BuildingsHelperOneTestCase(q6, b2), TestCase::QUICK); + AddTestCase(new BuildingsHelperOneTestCase(q6, b2), TestCase::Duration::QUICK); Vector vq7(0.2, 0.3, 2.001); PositionInBuilding q7; q7.pos = vq7; q7.indoor = false; - AddTestCase(new BuildingsHelperOneTestCase(q7, b2), TestCase::QUICK); + AddTestCase(new BuildingsHelperOneTestCase(q7, b2), TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/buildings/test/buildings-pathloss-test.cc b/src/buildings/test/buildings-pathloss-test.cc index 7e9a39f11..84c0e2838 100644 --- a/src/buildings/test/buildings-pathloss-test.cc +++ b/src/buildings/test/buildings-pathloss-test.cc @@ -54,7 +54,7 @@ BuildingsPathlossTestSuite::BuildingsPathlossTestSuite() LargeCity, 137.93, "OH Urban Large city"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new BuildingsPathlossTestCase(freq, 1, @@ -63,7 +63,7 @@ BuildingsPathlossTestSuite::BuildingsPathlossTestSuite() SmallCity, 137.88, "OH Urban small city"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new BuildingsPathlossTestCase(freq, 1, @@ -72,7 +72,7 @@ BuildingsPathlossTestSuite::BuildingsPathlossTestSuite() LargeCity, 128.03, "loss OH SubUrban"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new BuildingsPathlossTestCase(freq, 1, @@ -81,7 +81,7 @@ BuildingsPathlossTestSuite::BuildingsPathlossTestSuite() LargeCity, 110.21, "loss OH OpenAreas"), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test #2 COST231 Model (1500 < freq < 2000~2170 MHz) (Macro<->UE) @@ -94,7 +94,7 @@ BuildingsPathlossTestSuite::BuildingsPathlossTestSuite() LargeCity, 148.55, "COST231 Urban Large city"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new BuildingsPathlossTestCase(freq, 1, @@ -103,7 +103,7 @@ BuildingsPathlossTestSuite::BuildingsPathlossTestSuite() SmallCity, 150.64, "COST231 Urban small city and suburban"), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test #3 2.6 GHz model (Macro<->UE) @@ -116,7 +116,7 @@ BuildingsPathlossTestSuite::BuildingsPathlossTestSuite() SmallCity, 121.83, "2.6GHz model"), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test #4 ITU1411 LOS model (Macro<->UE) @@ -128,7 +128,7 @@ BuildingsPathlossTestSuite::BuildingsPathlossTestSuite() LargeCity, 81.00, "ITU1411 LOS"), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test #5 ITU1411 NLOS model (Macro<->UE) @@ -141,14 +141,14 @@ BuildingsPathlossTestSuite::BuildingsPathlossTestSuite() LargeCity, 143.69, "ITU1411 NLOS"), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test #6 ITUP1238 (HeNB <-> UE) freq = 2.1140e9; // E_UTRA BAND #1 see table 5.5-1 of 36.101 AddTestCase( new BuildingsPathlossTestCase(freq, 5, 6, UrbanEnvironment, LargeCity, 88.3855, "ITUP1238"), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test #7 Outdoor -> Indoor OkumuraHata (Macro<->UE) @@ -162,7 +162,7 @@ BuildingsPathlossTestSuite::BuildingsPathlossTestSuite() LargeCity, 155.55, "Okumura Hata Outdoor -> Indoor"), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test #8 Outdoor -> Indoor ITU1411 (Macro<->UE) freq = 2.1140e9; // E_UTRA BAND #1 see table 5.5-1 of 36.101 @@ -175,7 +175,7 @@ BuildingsPathlossTestSuite::BuildingsPathlossTestSuite() LargeCity, 88.000, "ITU1411 LOS Outdoor -> Indoor"), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test #9 Indoor -> Outdoor LOS (HeNB <-> UE) @@ -190,7 +190,7 @@ BuildingsPathlossTestSuite::BuildingsPathlossTestSuite() LargeCity, 84.838, "ITU1411 LOS Indoor -> Outdoor"), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test #10 Indoor -> Outdoor NLOS (HeNB <-> UE) @@ -205,7 +205,7 @@ BuildingsPathlossTestSuite::BuildingsPathlossTestSuite() LargeCity, 183.90, "ITU1411 NLOS Indoor -> Outdoor"), - TestCase::QUICK); + TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/buildings/test/buildings-penetration-loss-pathloss-test.cc b/src/buildings/test/buildings-penetration-loss-pathloss-test.cc index 0bcf90d52..f0619851e 100644 --- a/src/buildings/test/buildings-penetration-loss-pathloss-test.cc +++ b/src/buildings/test/buildings-penetration-loss-pathloss-test.cc @@ -273,7 +273,7 @@ class BuildingsPenetrationLossesTestSuite : public TestSuite BuildingsPenetrationLossesTestSuite::BuildingsPenetrationLossesTestSuite() : TestSuite("buildings-penetration-losses", UNIT) { - AddTestCase(new BuildingsPenetrationLossesTestCase, TestCase::QUICK); + AddTestCase(new BuildingsPenetrationLossesTestCase, TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/buildings/test/buildings-shadowing-test.cc b/src/buildings/test/buildings-shadowing-test.cc index 5adc16b65..03a4f63f1 100644 --- a/src/buildings/test/buildings-shadowing-test.cc +++ b/src/buildings/test/buildings-shadowing-test.cc @@ -51,15 +51,15 @@ BuildingsShadowingTestSuite::BuildingsShadowingTestSuite() // Test #1 Outdoor Model AddTestCase(new BuildingsShadowingTestCase(1, 2, 148.86, 7.0, "Outdoor Shadowing"), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test #2 Indoor model AddTestCase(new BuildingsShadowingTestCase(5, 6, 88.5724, 8.0, "Indoor Shadowing"), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test #3 Indoor -> Outdoor AddTestCase(new BuildingsShadowingTestCase(9, 10, 85.0012, 8.6, "Indoor -> Outdoor Shadowing"), - TestCase::QUICK); + TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/buildings/test/outdoor-random-walk-test.cc b/src/buildings/test/outdoor-random-walk-test.cc index 7f3c9433c..83e276a81 100644 --- a/src/buildings/test/outdoor-random-walk-test.cc +++ b/src/buildings/test/outdoor-random-walk-test.cc @@ -175,7 +175,7 @@ class OutdoorRandomWalkTestSuite : public TestSuite OutdoorRandomWalkTestSuite::OutdoorRandomWalkTestSuite() : TestSuite("outdoor-random-walk-model", UNIT) { - AddTestCase(new OutdoorRandomWalkTestCase, TestCase::QUICK); + AddTestCase(new OutdoorRandomWalkTestCase, TestCase::Duration::QUICK); } /// Static variable for test initialization 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 ad4240755..55d714598 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 @@ -540,14 +540,14 @@ ThreeGppV2vChCondModelsTestSuite::ThreeGppV2vChCondModelsTestSuite() : TestSuite("three-gpp-v2v-channel-condition-model", SYSTEM) { AddTestCase(new ThreeGppV2vBuildingsChCondModelTestCase, - TestCase::QUICK); // test for the deterministic procedure (NLOS vs LOS/NLOSv), based - // on buildings + TestCase::Duration::QUICK); // test for the deterministic procedure (NLOS vs + // LOS/NLOSv), based on buildings AddTestCase(new ThreeGppV2vUrbanLosNlosvChCondModelTestCase, - TestCase::QUICK); // test for the probabilistic procedure (LOS vs NLOSv), in V2V - // urban scenario + TestCase::Duration::QUICK); // test for the probabilistic procedure (LOS vs + // NLOSv), in V2V urban scenario AddTestCase(new ThreeGppV2vHighwayLosNlosvChCondModelTestCase, - TestCase::QUICK); // test for the probabilistic procedure (LOS vs NLOSv), in V2V - // highway scenario + TestCase::Duration::QUICK); // test for the probabilistic procedure (LOS vs + // NLOSv), in V2V highway scenario } /// Static variable for test initialization diff --git a/src/click/test/ipv4-click-routing-test.cc b/src/click/test/ipv4-click-routing-test.cc index bd9fb6095..1d1ef6d0c 100644 --- a/src/click/test/ipv4-click-routing-test.cc +++ b/src/click/test/ipv4-click-routing-test.cc @@ -252,9 +252,9 @@ class ClickIfidFromNameTestSuite : public TestSuite ClickIfidFromNameTestSuite() : TestSuite("routing-click", UNIT) { - AddTestCase(new ClickTrivialTest, TestCase::QUICK); - AddTestCase(new ClickIfidFromNameTest, TestCase::QUICK); - AddTestCase(new ClickIpMacAddressFromNameTest, TestCase::QUICK); + AddTestCase(new ClickTrivialTest, TestCase::Duration::QUICK); + AddTestCase(new ClickIfidFromNameTest, TestCase::Duration::QUICK); + AddTestCase(new ClickIpMacAddressFromNameTest, TestCase::Duration::QUICK); } }; diff --git a/src/core/model/example-as-test.cc b/src/core/model/example-as-test.cc index 3ff6e203b..e7bb96ba5 100644 --- a/src/core/model/example-as-test.cc +++ b/src/core/model/example-as-test.cc @@ -153,7 +153,7 @@ ExampleAsTestSuite::ExampleAsTestSuite(const std::string name, const std::string program, const std::string dataDir, const std::string args /* = "" */, - const TestDuration duration /* =QUICK */, + const Duration duration /* =QUICK */, const bool shouldNotErr /* = true */) : TestSuite(name, EXAMPLE) { diff --git a/src/core/model/example-as-test.h b/src/core/model/example-as-test.h index a13c482c1..c730ec39e 100644 --- a/src/core/model/example-as-test.h +++ b/src/core/model/example-as-test.h @@ -218,7 +218,7 @@ class ExampleAsTestSuite : public TestSuite const std::string program, const std::string dataDir, const std::string args = "", - const TestDuration duration = QUICK, + const Duration duration = Duration::QUICK, const bool shouldNotErr = true); }; // class ExampleAsTestSuite diff --git a/src/core/model/test.cc b/src/core/model/test.cc index 1b319c9d4..a47a1e684 100644 --- a/src/core/model/test.cc +++ b/src/core/model/test.cc @@ -238,7 +238,7 @@ class TestRunnerImpl : public Singleton */ std::list FilterTests(std::string testName, TestSuite::Type testType, - TestCase::TestDuration maximumTestDuration); + TestCase::Duration maximumTestDuration); /** Container type for the test. */ typedef std::vector TestSuiteVector; @@ -279,7 +279,7 @@ TestCase::TestCase(std::string name) m_runner(nullptr), m_result(nullptr), m_name(name), - m_duration(TestCase::QUICK) + m_duration(TestCase::Duration::QUICK) { NS_LOG_FUNCTION(this << name); } @@ -298,7 +298,7 @@ TestCase::~TestCase() } void -TestCase::AddTestCase(TestCase* testCase, TestCase::TestDuration duration) +TestCase::AddTestCase(TestCase* testCase, TestCase::Duration duration) { NS_LOG_FUNCTION(&testCase << duration); @@ -833,7 +833,7 @@ TestRunnerImpl::PrintTestTypeList() const std::list TestRunnerImpl::FilterTests(std::string testName, TestSuite::Type testType, - TestCase::TestDuration maximumTestDuration) + TestCase::Duration maximumTestDuration) { NS_LOG_FUNCTION(this << testName << testType); std::list tests; @@ -894,7 +894,7 @@ TestRunnerImpl::Run(int argc, char* argv[]) bool printTestTypeList = false; bool printTestNameList = false; bool printTestTypeAndName = false; - TestCase::TestDuration maximumTestDuration = TestCase::QUICK; + TestCase::Duration maximumTestDuration = TestCase::Duration::QUICK; char* progname = argv[0]; char** argi = argv; @@ -976,15 +976,15 @@ TestRunnerImpl::Run(int argc, char* argv[]) // Set the maximum test length allowed. if (fullness == "QUICK") { - maximumTestDuration = TestCase::QUICK; + maximumTestDuration = TestCase::Duration::QUICK; } else if (fullness == "EXTENSIVE") { - maximumTestDuration = TestCase::EXTENSIVE; + maximumTestDuration = TestCase::Duration::EXTENSIVE; } else if (fullness == "TAKES_FOREVER") { - maximumTestDuration = TestCase::TAKES_FOREVER; + maximumTestDuration = TestCase::Duration::TAKES_FOREVER; } else { @@ -1144,4 +1144,19 @@ TestRunner::Run(int argc, char* argv[]) return TestRunnerImpl::Get()->Run(argc, argv); } +std::ostream& +operator<<(std::ostream& os, TestCase::Duration duration) +{ + switch (duration) + { + case TestCase::Duration::QUICK: + return os << "QUICK"; + case TestCase::Duration::EXTENSIVE: + return os << "EXTENSIVE"; + case TestCase::Duration::TAKES_FOREVER: + return os << "TAKES_FOREVER"; + }; + return os << "UNKNOWN(" << static_cast(duration) << ")"; +} + } // namespace ns3 diff --git a/src/core/model/test.h b/src/core/model/test.h index 4e07b8b23..92d204091 100644 --- a/src/core/model/test.h +++ b/src/core/model/test.h @@ -18,6 +18,7 @@ #ifndef NS3_TEST_H #define NS3_TEST_H +#include "deprecated.h" #include "system-wall-clock-ms.h" #include @@ -1060,13 +1061,24 @@ class TestCase { public: /** \brief How long the test takes to execute. */ - enum TestDuration + enum class Duration { QUICK = 1, //!< Fast test. EXTENSIVE = 2, //!< Medium length test. TAKES_FOREVER = 3 //!< Very long running test. }; + NS_DEPRECATED_3_42("Use Duration::QUICK instead") + static constexpr auto QUICK = Duration::QUICK; //!< @deprecated See Duration::QUICK. + NS_DEPRECATED_3_42("Use Duration::EXTENSIVE instead") + static constexpr auto EXTENSIVE = Duration::EXTENSIVE; //!< @deprecated See Duration::EXTENSIVE. + NS_DEPRECATED_3_42("Use Duration::TAKES_FOREVER instead") + static constexpr auto TAKES_FOREVER = + Duration::TAKES_FOREVER; //!< @deprecated See Duration::TAKES_FOREVER. + + using TestDuration NS_DEPRECATED_3_42("Use Duration instead") = + Duration; //!< @deprecated See Duration. + /** * Destructor */ @@ -1096,7 +1108,7 @@ class TestCase * \param [in] duration Amount of time this test takes to execute * (defaults to QUICK). */ - void AddTestCase(TestCase* testCase, TestDuration duration = QUICK); + void AddTestCase(TestCase* testCase, Duration duration = Duration::QUICK); /** * \brief Set the data directory where reference trace files can be @@ -1242,7 +1254,7 @@ class TestCase TestRunnerImpl* m_runner; //!< Pointer to the TestRunner Result* m_result; //!< Results data std::string m_name; //!< TestCase name - TestDuration m_duration; //!< TestCase duration + Duration m_duration; //!< TestCase duration }; /** @@ -1404,6 +1416,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] duration The TestCase::Duration. + * @return The reference to the output stream. + */ +std::ostream& operator<<(std::ostream& os, TestCase::Duration duration); + } // namespace ns3 #endif /* NS3_TEST_H */ diff --git a/src/core/test/attribute-container-test-suite.cc b/src/core/test/attribute-container-test-suite.cc index fa0359319..3b8ecd038 100644 --- a/src/core/test/attribute-container-test-suite.cc +++ b/src/core/test/attribute-container-test-suite.cc @@ -549,9 +549,9 @@ class AttributeContainerTestSuite : public TestSuite AttributeContainerTestSuite::AttributeContainerTestSuite() : TestSuite("attribute-container-test-suite", UNIT) { - AddTestCase(new AttributeContainerTestCase(), TestCase::QUICK); - AddTestCase(new AttributeContainerSerializationTestCase(), TestCase::QUICK); - AddTestCase(new AttributeContainerSetGetTestCase(), TestCase::QUICK); + AddTestCase(new AttributeContainerTestCase(), TestCase::Duration::QUICK); + AddTestCase(new AttributeContainerSerializationTestCase(), TestCase::Duration::QUICK); + AddTestCase(new AttributeContainerSetGetTestCase(), TestCase::Duration::QUICK); } static AttributeContainerTestSuite diff --git a/src/core/test/attribute-test-suite.cc b/src/core/test/attribute-test-suite.cc index 9dac00d32..9cbca0080 100644 --- a/src/core/test/attribute-test-suite.cc +++ b/src/core/test/attribute-test-suite.cc @@ -2087,41 +2087,41 @@ AttributesTestSuite::AttributesTestSuite() : TestSuite("attributes", UNIT) { AddTestCase(new AttributeTestCase("Check Attributes of type BooleanValue"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new AttributeTestCase("Check Attributes of type IntegerValue"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new AttributeTestCase("Check Attributes of type UintegerValue"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new AttributeTestCase("Check Attributes of type DoubleValue"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new AttributeTestCase>( "Check Attributes of type EnumValue"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new AttributeTestCase>( "Check Attributes of type EnumValue (wrapping an enum class)"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new AttributeTestCase("Check Attributes of type TimeValue"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new RandomVariableStreamAttributeTestCase("Check Attributes of type RandomVariableStream"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ObjectVectorAttributeTestCase("Check Attributes of type ObjectVectorValue"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ObjectMapAttributeTestCase("Check Attributes of type ObjectMapValue"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new PointerAttributeTestCase("Check Attributes of type PointerValue"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CallbackValueTestCase("Check Attributes of type CallbackValue"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new IntegerTraceSourceAttributeTestCase( "Ensure TracedValue can be set like IntegerValue"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new IntegerTraceSourceTestCase("Ensure TracedValue also works as trace source"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TracedCallbackTestCase( "Ensure TracedCallback works as trace source"), - TestCase::QUICK); + TestCase::Duration::QUICK); } static AttributesTestSuite g_attributesTestSuite; //!< Static variable for test initialization diff --git a/src/core/test/callback-test-suite.cc b/src/core/test/callback-test-suite.cc index 0e4ef6121..885a79734 100644 --- a/src/core/test/callback-test-suite.cc +++ b/src/core/test/callback-test-suite.cc @@ -1192,12 +1192,12 @@ class CallbackTestSuite : public TestSuite CallbackTestSuite::CallbackTestSuite() : TestSuite("callback", UNIT) { - AddTestCase(new BasicCallbackTestCase, TestCase::QUICK); - AddTestCase(new MakeCallbackTestCase, TestCase::QUICK); - AddTestCase(new MakeBoundCallbackTestCase, TestCase::QUICK); - AddTestCase(new CallbackEqualityTestCase, TestCase::QUICK); - AddTestCase(new NullifyCallbackTestCase, TestCase::QUICK); - AddTestCase(new MakeCallbackTemplatesTestCase, TestCase::QUICK); + AddTestCase(new BasicCallbackTestCase, TestCase::Duration::QUICK); + AddTestCase(new MakeCallbackTestCase, TestCase::Duration::QUICK); + AddTestCase(new MakeBoundCallbackTestCase, TestCase::Duration::QUICK); + AddTestCase(new CallbackEqualityTestCase, TestCase::Duration::QUICK); + AddTestCase(new NullifyCallbackTestCase, TestCase::Duration::QUICK); + AddTestCase(new MakeCallbackTemplatesTestCase, TestCase::Duration::QUICK); } static CallbackTestSuite g_gallbackTestSuite; //!< Static variable for test initialization diff --git a/src/core/test/int64x64-test-suite.cc b/src/core/test/int64x64-test-suite.cc index dd691477e..6fa940a3b 100644 --- a/src/core/test/int64x64-test-suite.cc +++ b/src/core/test/int64x64-test-suite.cc @@ -1559,18 +1559,18 @@ class Int64x64TestSuite : public TestSuite Int64x64TestSuite() : TestSuite("int64x64", UNIT) { - AddTestCase(new Int64x64ImplTestCase(), TestCase::QUICK); - AddTestCase(new Int64x64HiLoTestCase(), TestCase::QUICK); - AddTestCase(new Int64x64IntRoundTestCase(), TestCase::QUICK); - AddTestCase(new Int64x64ArithmeticTestCase(), TestCase::QUICK); - AddTestCase(new Int64x64CompareTestCase(), TestCase::QUICK); - AddTestCase(new Int64x64InputTestCase(), TestCase::QUICK); - AddTestCase(new Int64x64InputOutputTestCase(), TestCase::QUICK); - AddTestCase(new Int64x64Bug455TestCase(), TestCase::QUICK); - AddTestCase(new Int64x64Bug863TestCase(), TestCase::QUICK); - AddTestCase(new Int64x64Bug1786TestCase(), TestCase::QUICK); - AddTestCase(new Int64x64InvertTestCase(), TestCase::QUICK); - AddTestCase(new Int64x64DoubleTestCase(), TestCase::QUICK); + AddTestCase(new Int64x64ImplTestCase(), TestCase::Duration::QUICK); + AddTestCase(new Int64x64HiLoTestCase(), TestCase::Duration::QUICK); + AddTestCase(new Int64x64IntRoundTestCase(), TestCase::Duration::QUICK); + AddTestCase(new Int64x64ArithmeticTestCase(), TestCase::Duration::QUICK); + AddTestCase(new Int64x64CompareTestCase(), TestCase::Duration::QUICK); + AddTestCase(new Int64x64InputTestCase(), TestCase::Duration::QUICK); + AddTestCase(new Int64x64InputOutputTestCase(), TestCase::Duration::QUICK); + AddTestCase(new Int64x64Bug455TestCase(), TestCase::Duration::QUICK); + AddTestCase(new Int64x64Bug863TestCase(), TestCase::Duration::QUICK); + AddTestCase(new Int64x64Bug1786TestCase(), TestCase::Duration::QUICK); + AddTestCase(new Int64x64InvertTestCase(), TestCase::Duration::QUICK); + AddTestCase(new Int64x64DoubleTestCase(), TestCase::Duration::QUICK); } }; diff --git a/src/core/test/length-test-suite.cc b/src/core/test/length-test-suite.cc index 1d2003fa5..748720a12 100644 --- a/src/core/test/length-test-suite.cc +++ b/src/core/test/length-test-suite.cc @@ -1605,8 +1605,8 @@ class LengthTestSuite : public TestSuite LengthTestSuite::LengthTestSuite() : TestSuite("length") { - AddTestCase(new LengthTestCase(), TestCase::QUICK); - AddTestCase(new LengthValueTestCase(), TestCase::QUICK); + AddTestCase(new LengthTestCase(), TestCase::Duration::QUICK); + AddTestCase(new LengthValueTestCase(), TestCase::Duration::QUICK); } /** diff --git a/src/core/test/pair-value-test-suite.cc b/src/core/test/pair-value-test-suite.cc index 595252436..b4e901ffc 100644 --- a/src/core/test/pair-value-test-suite.cc +++ b/src/core/test/pair-value-test-suite.cc @@ -213,8 +213,8 @@ class PairValueTestSuite : public TestSuite PairValueTestSuite::PairValueTestSuite() : TestSuite("pair-value-test-suite", UNIT) { - AddTestCase(new PairValueTestCase(), TestCase::QUICK); - AddTestCase(new PairValueSettingsTestCase(), TestCase::QUICK); + AddTestCase(new PairValueTestCase(), TestCase::Duration::QUICK); + AddTestCase(new PairValueSettingsTestCase(), TestCase::Duration::QUICK); } static PairValueTestSuite g_pairValueTestSuite; //!< Static variable for test initialization diff --git a/src/core/test/rng-test-suite.cc b/src/core/test/rng-test-suite.cc index 586b08a48..dbe37a570 100644 --- a/src/core/test/rng-test-suite.cc +++ b/src/core/test/rng-test-suite.cc @@ -490,10 +490,10 @@ class RngTestSuite : public TestSuite RngTestSuite::RngTestSuite() : TestSuite("random-number-generators", UNIT) { - AddTestCase(new RngUniformTestCase, TestCase::QUICK); - AddTestCase(new RngNormalTestCase, TestCase::QUICK); - AddTestCase(new RngExponentialTestCase, TestCase::QUICK); - AddTestCase(new RngParetoTestCase, TestCase::QUICK); + AddTestCase(new RngUniformTestCase, TestCase::Duration::QUICK); + AddTestCase(new RngNormalTestCase, TestCase::Duration::QUICK); + AddTestCase(new RngExponentialTestCase, TestCase::Duration::QUICK); + AddTestCase(new RngParetoTestCase, TestCase::Duration::QUICK); } static RngTestSuite g_rngTestSuite; //!< Static variable for test initialization diff --git a/src/core/test/simulator-test-suite.cc b/src/core/test/simulator-test-suite.cc index e2ff55969..0f56d3030 100644 --- a/src/core/test/simulator-test-suite.cc +++ b/src/core/test/simulator-test-suite.cc @@ -721,15 +721,15 @@ class SimulatorTestSuite : public TestSuite ObjectFactory factory; factory.SetTypeId(ListScheduler::GetTypeId()); - AddTestCase(new SimulatorEventsTestCase(factory), TestCase::QUICK); + AddTestCase(new SimulatorEventsTestCase(factory), TestCase::Duration::QUICK); factory.SetTypeId(MapScheduler::GetTypeId()); - AddTestCase(new SimulatorEventsTestCase(factory), TestCase::QUICK); + AddTestCase(new SimulatorEventsTestCase(factory), TestCase::Duration::QUICK); factory.SetTypeId(HeapScheduler::GetTypeId()); - AddTestCase(new SimulatorEventsTestCase(factory), TestCase::QUICK); + AddTestCase(new SimulatorEventsTestCase(factory), TestCase::Duration::QUICK); factory.SetTypeId(CalendarScheduler::GetTypeId()); - AddTestCase(new SimulatorEventsTestCase(factory), TestCase::QUICK); + AddTestCase(new SimulatorEventsTestCase(factory), TestCase::Duration::QUICK); factory.SetTypeId(PriorityQueueScheduler::GetTypeId()); - AddTestCase(new SimulatorEventsTestCase(factory), TestCase::QUICK); + AddTestCase(new SimulatorEventsTestCase(factory), TestCase::Duration::QUICK); } }; diff --git a/src/core/test/threaded-test-suite.cc b/src/core/test/threaded-test-suite.cc index da75f31ce..3490822ac 100644 --- a/src/core/test/threaded-test-suite.cc +++ b/src/core/test/threaded-test-suite.cc @@ -311,7 +311,7 @@ class ThreadedSimulatorTestSuite : public TestSuite factory.SetTypeId(schedulerType); AddTestCase( new ThreadedSimulatorEventsTestCase(factory, simulatorType, threadCount), - TestCase::QUICK); + TestCase::Duration::QUICK); } } } diff --git a/src/core/test/time-test-suite.cc b/src/core/test/time-test-suite.cc index 1b522a3c2..46c9c00cb 100644 --- a/src/core/test/time-test-suite.cc +++ b/src/core/test/time-test-suite.cc @@ -544,10 +544,10 @@ static class TimeTestSuite : public TestSuite TimeTestSuite() : TestSuite("time", UNIT) { - AddTestCase(new TimeWithSignTestCase(), TestCase::QUICK); - AddTestCase(new TimeInputOutputTestCase(), TestCase::QUICK); + AddTestCase(new TimeWithSignTestCase(), TestCase::Duration::QUICK); + AddTestCase(new TimeInputOutputTestCase(), TestCase::Duration::QUICK); // This should be last, since it changes the resolution - AddTestCase(new TimeSimpleTestCase(), TestCase::QUICK); + AddTestCase(new TimeSimpleTestCase(), TestCase::Duration::QUICK); } } /** \brief Member variable for time test suite */ diff --git a/src/core/test/timer-test-suite.cc b/src/core/test/timer-test-suite.cc index dd797478d..8e8ae95b1 100644 --- a/src/core/test/timer-test-suite.cc +++ b/src/core/test/timer-test-suite.cc @@ -231,8 +231,8 @@ class TimerTestSuite : public TestSuite TimerTestSuite() : TestSuite("timer", UNIT) { - AddTestCase(new TimerStateTestCase(), TestCase::QUICK); - AddTestCase(new TimerTemplateTestCase(), TestCase::QUICK); + 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 ded8f8e06..f21939a5d 100644 --- a/src/core/test/traced-callback-test-suite.cc +++ b/src/core/test/traced-callback-test-suite.cc @@ -147,7 +147,7 @@ class TracedCallbackTestSuite : public TestSuite TracedCallbackTestSuite::TracedCallbackTestSuite() : TestSuite("traced-callback", UNIT) { - AddTestCase(new BasicTracedCallbackTestCase, TestCase::QUICK); + AddTestCase(new BasicTracedCallbackTestCase, TestCase::Duration::QUICK); } static TracedCallbackTestSuite diff --git a/src/core/test/tuple-value-test-suite.cc b/src/core/test/tuple-value-test-suite.cc index 2db327dba..e45538d46 100644 --- a/src/core/test/tuple-value-test-suite.cc +++ b/src/core/test/tuple-value-test-suite.cc @@ -323,7 +323,7 @@ class TupleValueTestSuite : public TestSuite TupleValueTestSuite::TupleValueTestSuite() : TestSuite("tuple-value-test-suite", UNIT) { - AddTestCase(new TupleValueTestCase(), TestCase::QUICK); + AddTestCase(new TupleValueTestCase(), TestCase::Duration::QUICK); } static TupleValueTestSuite g_tupleValueTestSuite; //!< Static variable for test initialization diff --git a/src/core/test/type-id-test-suite.cc b/src/core/test/type-id-test-suite.cc index 3f50ffcc3..8ce221f5d 100644 --- a/src/core/test/type-id-test-suite.cc +++ b/src/core/test/type-id-test-suite.cc @@ -452,9 +452,9 @@ TypeIdTestSuite::TypeIdTestSuite() // UniqueIdTestCase, the artificial collisions added by // CollisionTestCase will show up in the list of TypeIds // as chained. - AddTestCase(new UniqueTypeIdTestCase, QUICK); - AddTestCase(new CollisionTestCase, QUICK); - AddTestCase(new DeprecatedAttributeTestCase, QUICK); + AddTestCase(new UniqueTypeIdTestCase, Duration::QUICK); + AddTestCase(new CollisionTestCase, Duration::QUICK); + AddTestCase(new DeprecatedAttributeTestCase, Duration::QUICK); } /// Static variable for test initialization. @@ -474,7 +474,7 @@ class TypeIdPerformanceSuite : public TestSuite TypeIdPerformanceSuite::TypeIdPerformanceSuite() : TestSuite("type-id-perf", PERFORMANCE) { - AddTestCase(new LookupTimeTestCase, QUICK); + AddTestCase(new LookupTimeTestCase, Duration::QUICK); } /// Static variable for test initialization. diff --git a/src/dsdv/test/dsdv-testcase.cc b/src/dsdv/test/dsdv-testcase.cc index 508bb82b7..517f3e8a2 100644 --- a/src/dsdv/test/dsdv-testcase.cc +++ b/src/dsdv/test/dsdv-testcase.cc @@ -220,7 +220,7 @@ class DsdvTestSuite : public TestSuite DsdvTestSuite() : TestSuite("routing-dsdv", UNIT) { - AddTestCase(new DsdvHeaderTestCase(), TestCase::QUICK); - AddTestCase(new DsdvTableTestCase(), TestCase::QUICK); + AddTestCase(new DsdvHeaderTestCase(), TestCase::Duration::QUICK); + AddTestCase(new DsdvTableTestCase(), TestCase::Duration::QUICK); } } g_dsdvTestSuite; ///< the test suite diff --git a/src/dsr/test/dsr-test-suite.cc b/src/dsr/test/dsr-test-suite.cc index c77877f47..623d882d4 100644 --- a/src/dsr/test/dsr-test-suite.cc +++ b/src/dsr/test/dsr-test-suite.cc @@ -632,14 +632,14 @@ class DsrTestSuite : public TestSuite DsrTestSuite() : TestSuite("routing-dsr", UNIT) { - AddTestCase(new DsrFsHeaderTest, TestCase::QUICK); - AddTestCase(new DsrRreqHeaderTest, TestCase::QUICK); - AddTestCase(new DsrRrepHeaderTest, TestCase::QUICK); - AddTestCase(new DsrSRHeaderTest, TestCase::QUICK); - AddTestCase(new DsrRerrHeaderTest, TestCase::QUICK); - AddTestCase(new DsrAckReqHeaderTest, TestCase::QUICK); - AddTestCase(new DsrAckHeaderTest, TestCase::QUICK); - AddTestCase(new DsrCacheEntryTest, TestCase::QUICK); - AddTestCase(new DsrSendBuffTest, TestCase::QUICK); + AddTestCase(new DsrFsHeaderTest, TestCase::Duration::QUICK); + AddTestCase(new DsrRreqHeaderTest, TestCase::Duration::QUICK); + AddTestCase(new DsrRrepHeaderTest, TestCase::Duration::QUICK); + AddTestCase(new DsrSRHeaderTest, TestCase::Duration::QUICK); + AddTestCase(new DsrRerrHeaderTest, TestCase::Duration::QUICK); + AddTestCase(new DsrAckReqHeaderTest, TestCase::Duration::QUICK); + AddTestCase(new DsrAckHeaderTest, TestCase::Duration::QUICK); + AddTestCase(new DsrCacheEntryTest, TestCase::Duration::QUICK); + AddTestCase(new DsrSendBuffTest, TestCase::Duration::QUICK); } } g_dsrTestSuite; diff --git a/src/energy/test/basic-energy-harvester-test.cc b/src/energy/test/basic-energy-harvester-test.cc index 28befc521..ce06a7aad 100644 --- a/src/energy/test/basic-energy-harvester-test.cc +++ b/src/energy/test/basic-energy-harvester-test.cc @@ -135,7 +135,7 @@ class BasicEnergyHarvesterTestSuite : public TestSuite BasicEnergyHarvesterTestSuite::BasicEnergyHarvesterTestSuite() : TestSuite("basic-energy-harvester", UNIT) { - AddTestCase(new BasicEnergyHarvesterTestCase, TestCase::QUICK); + AddTestCase(new BasicEnergyHarvesterTestCase, TestCase::Duration::QUICK); } /// create an instance of the test suite diff --git a/src/energy/test/li-ion-energy-source-test.cc b/src/energy/test/li-ion-energy-source-test.cc index 46a927b3f..6ace4ba73 100644 --- a/src/energy/test/li-ion-energy-source-test.cc +++ b/src/energy/test/li-ion-energy-source-test.cc @@ -94,7 +94,7 @@ class LiIonEnergySourceTestSuite : public TestSuite LiIonEnergySourceTestSuite::LiIonEnergySourceTestSuite() : TestSuite("li-ion-energy-source", UNIT) { - AddTestCase(new LiIonEnergyTestCase, TestCase::QUICK); + AddTestCase(new LiIonEnergyTestCase, TestCase::Duration::QUICK); } /// create an instance of the test suite diff --git a/src/internet-apps/test/dhcp-test.cc b/src/internet-apps/test/dhcp-test.cc index 15eb7865e..7f84e002d 100644 --- a/src/internet-apps/test/dhcp-test.cc +++ b/src/internet-apps/test/dhcp-test.cc @@ -170,7 +170,7 @@ class DhcpTestSuite : public TestSuite DhcpTestSuite::DhcpTestSuite() : TestSuite("dhcp", UNIT) { - AddTestCase(new DhcpTestCase, TestCase::QUICK); + AddTestCase(new DhcpTestCase, TestCase::Duration::QUICK); } static DhcpTestSuite dhcpTestSuite; //!< Static variable for test initialization diff --git a/src/internet-apps/test/ipv6-radvd-test.cc b/src/internet-apps/test/ipv6-radvd-test.cc index f930abf92..a6be3e51f 100644 --- a/src/internet-apps/test/ipv6-radvd-test.cc +++ b/src/internet-apps/test/ipv6-radvd-test.cc @@ -311,7 +311,7 @@ class RadvdTestSuite : public TestSuite RadvdTestSuite::RadvdTestSuite() : TestSuite("radvd", UNIT) { - AddTestCase(new RadvdTestCase, TestCase::QUICK); + AddTestCase(new RadvdTestCase, TestCase::Duration::QUICK); } static RadvdTestSuite radvdTestSuite; //!< Static variable for test initialization diff --git a/src/internet-apps/test/ping-test.cc b/src/internet-apps/test/ping-test.cc index a09327b15..3186b1ed4 100644 --- a/src/internet-apps/test/ping-test.cc +++ b/src/internet-apps/test/ping-test.cc @@ -586,7 +586,7 @@ PingTestSuite::PingTestSuite() testcase1v4->CheckReportReceived(5); testcase1v4->CheckTraceTx(5); testcase1v4->SetDestinationAddress(Ipv4Address("10.0.0.2")); - AddTestCase(testcase1v4, TestCase::QUICK); + AddTestCase(testcase1v4, TestCase::Duration::QUICK); auto testcase1v6 = new PingTestCase( "1. Unlimited pings, no losses, StopApplication () with no packets in flight IPv6", @@ -598,7 +598,7 @@ PingTestSuite::PingTestSuite() testcase1v6->CheckReportReceived(5); testcase1v6->CheckTraceTx(5); testcase1v6->SetDestinationAddress(Ipv6Address("2001:1::200:ff:fe00:2")); - AddTestCase(testcase1v6, TestCase::QUICK); + AddTestCase(testcase1v6, TestCase::Duration::QUICK); // 2. Unlimited pings, no losses, StopApplication () with 1 packet in flight // Configuration: Ping::Count = 0, Ping::Interval = 1s, Ping start time = @@ -617,7 +617,7 @@ PingTestSuite::PingTestSuite() testcase2v4->CheckReportTransmitted(1); testcase2v4->CheckReportReceived(0); testcase1v4->SetDestinationAddress(Ipv4Address("10.0.0.2")); - AddTestCase(testcase2v4, TestCase::QUICK); + AddTestCase(testcase2v4, TestCase::Duration::QUICK); auto testcase2v6 = new PingTestCase( "2. Unlimited pings, no losses, StopApplication () with 1 packet in flight IPv6", @@ -628,7 +628,7 @@ PingTestSuite::PingTestSuite() testcase2v6->CheckReportTransmitted(1); testcase2v6->CheckReportReceived(0); testcase2v6->SetDestinationAddress(Ipv6Address("2001:1::200:ff:fe00:2")); - AddTestCase(testcase2v6, TestCase::QUICK); + AddTestCase(testcase2v6, TestCase::Duration::QUICK); // 3. Test for operation of count attribute and the resulting StopApplication time after all // pings were received. Limited pings, no losses, StopApplication () with no packet in flight @@ -657,7 +657,7 @@ PingTestSuite::PingTestSuite() testcase3v4->CheckReportTime(MicroSeconds(2020001)); testcase3v4->CheckTraceTx(expectedTx); testcase3v4->SetDestinationAddress(Ipv4Address("10.0.0.2")); - AddTestCase(testcase3v4, TestCase::QUICK); + AddTestCase(testcase3v4, TestCase::Duration::QUICK); auto testcase3v6 = new PingTestCase("3. Test for operation of count attribute and exit " "time after all pings were received, IPv6", @@ -671,7 +671,7 @@ PingTestSuite::PingTestSuite() testcase3v6->CheckReportTime(MicroSeconds(2020001)); testcase3v6->CheckTraceTx(expectedTx); testcase3v6->SetDestinationAddress(Ipv6Address("2001:1::200:ff:fe00:2")); - AddTestCase(testcase3v6, TestCase::QUICK); + AddTestCase(testcase3v6, TestCase::Duration::QUICK); // 4. Test for the operation of interval attribute for IPv4 // Unlimited pings, no losses, StopApplication () with no packet in flight @@ -692,7 +692,7 @@ PingTestSuite::PingTestSuite() testcase4v4->CheckReportTransmitted(2); testcase4v4->CheckReportReceived(2); testcase4v4->SetDestinationAddress(Ipv4Address("10.0.0.2")); - AddTestCase(testcase4v4, TestCase::QUICK); + AddTestCase(testcase4v4, TestCase::Duration::QUICK); auto testcase4v6 = new PingTestCase("4. Test for the operation of interval attribute for IPv6", USEIPV6_TRUE); @@ -703,7 +703,7 @@ PingTestSuite::PingTestSuite() testcase4v6->CheckReportTransmitted(2); testcase4v6->CheckReportReceived(2); testcase4v6->SetDestinationAddress(Ipv6Address("2001:1::200:ff:fe00:2")); - AddTestCase(testcase4v6, TestCase::QUICK); + AddTestCase(testcase4v6, TestCase::Duration::QUICK); // 5. Test for behavior of pinging an unreachable host when the // network does not send an ICMP unreachable message. @@ -730,7 +730,7 @@ PingTestSuite::PingTestSuite() testcase5v4->CheckReportTransmitted(5); testcase5v4->CheckReportReceived(0); testcase5v4->CheckReportLoss(100); - AddTestCase(testcase5v4, TestCase::QUICK); + AddTestCase(testcase5v4, TestCase::Duration::QUICK); auto testcase5v6 = new PingTestCase("5. Test for behavior of ping to unreachable IPv6 address", USEIPV6_TRUE); @@ -740,7 +740,7 @@ PingTestSuite::PingTestSuite() testcase5v6->CheckReportTransmitted(5); testcase5v6->CheckReportReceived(0); testcase5v6->CheckReportLoss(100); - AddTestCase(testcase5v6, TestCase::QUICK); + AddTestCase(testcase5v6, TestCase::Duration::QUICK); // 6. Test for behavior of pinging an broadcast (or multicast) address. // Limited pings, no losses, StopApplication () with no packet in flight @@ -763,7 +763,7 @@ PingTestSuite::PingTestSuite() testcase6v4->CheckReportTransmitted(5); testcase6v4->CheckReportReceived(5); testcase6v4->CheckReportLoss(0); - AddTestCase(testcase6v4, TestCase::QUICK); + AddTestCase(testcase6v4, TestCase::Duration::QUICK); auto testcase6v6 = new PingTestCase("6. Test for behavior of ping to all-nodes multicast IPv6 address", @@ -774,7 +774,7 @@ PingTestSuite::PingTestSuite() testcase6v6->CheckReportTransmitted(5); testcase6v6->CheckReportReceived(5); testcase6v6->CheckReportLoss(0); - AddTestCase(testcase6v6, TestCase::QUICK); + AddTestCase(testcase6v6, TestCase::Duration::QUICK); // 7. Test behavior of first reply lost in a count-limited configuration. // Limited pings, no losses, StopApplication () with no packet in flight @@ -803,7 +803,7 @@ PingTestSuite::PingTestSuite() testcase7v4->CheckReportReceived(2); testcase7v4->CheckReportLoss(33); // 33% testcase7v4->CheckReportTime(MicroSeconds(3040000)); - AddTestCase(testcase7v4, TestCase::QUICK); + AddTestCase(testcase7v4, TestCase::Duration::QUICK); auto testcase7v6 = new PingTestCase( "7. Test behavior of first reply lost in a count-limited configuration, IPv6", @@ -819,7 +819,7 @@ PingTestSuite::PingTestSuite() testcase7v6->CheckReportReceived(2); testcase7v6->CheckReportLoss(33); // 33% testcase7v6->CheckReportTime(MicroSeconds(3040000)); - AddTestCase(testcase7v6, TestCase::QUICK); + AddTestCase(testcase7v6, TestCase::Duration::QUICK); // 8. Test behavior of second reply lost in a count-limited configuration. // Limited pings, no losses, StopApplication () with no packet in flight @@ -848,7 +848,7 @@ PingTestSuite::PingTestSuite() testcase8v4->CheckReportReceived(2); testcase8v4->CheckReportLoss(33); // 33% testcase8v4->CheckReportTime(MicroSeconds(3040000)); - AddTestCase(testcase8v4, TestCase::QUICK); + AddTestCase(testcase8v4, TestCase::Duration::QUICK); auto testcase8v6 = new PingTestCase( "8. Test behavior of second reply lost in a count-limited configuration, IPv6", @@ -864,7 +864,7 @@ PingTestSuite::PingTestSuite() testcase8v6->CheckReportReceived(2); testcase8v6->CheckReportLoss(33); // 33% testcase8v6->CheckReportTime(MicroSeconds(3040000)); - AddTestCase(testcase8v6, TestCase::QUICK); + AddTestCase(testcase8v6, TestCase::Duration::QUICK); // 9. Test behavior of last reply lost in a count-limited configuration. // Limited pings, no losses, StopApplication () with no packet in flight @@ -893,7 +893,7 @@ PingTestSuite::PingTestSuite() testcase9v4->CheckReportReceived(2); testcase9v4->CheckReportLoss(33); // 33% testcase9v4->CheckReportTime(MicroSeconds(3040000)); - AddTestCase(testcase9v4, TestCase::QUICK); + AddTestCase(testcase9v4, TestCase::Duration::QUICK); auto testcase9v6 = new PingTestCase( "9. Test behavior of last reply lost in a count-limited configuration, IPv6", @@ -909,7 +909,7 @@ PingTestSuite::PingTestSuite() testcase9v6->CheckReportReceived(2); testcase9v6->CheckReportLoss(33); // 33% testcase9v6->CheckReportTime(MicroSeconds(3040000)); - AddTestCase(testcase9v6, TestCase::QUICK); + AddTestCase(testcase9v6, TestCase::Duration::QUICK); #ifdef NOTYET // @@ -933,7 +933,7 @@ PingTestSuite::PingTestSuite() testcase10v4->CheckReportTransmitted(1); testcase10v4->CheckReportReceived(1); testcase10v4->CheckReportTime(MicroSeconds(1020028)); - AddTestCase(testcase10v4, TestCase::QUICK); + AddTestCase(testcase10v4, TestCase::Duration::QUICK); #endif } 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 0210ed46a..e479acdca 100644 --- a/src/internet/test/global-route-manager-impl-test-suite.cc +++ b/src/internet/test/global-route-manager-impl-test-suite.cc @@ -231,7 +231,7 @@ class GlobalRouteManagerImplTestSuite : public TestSuite GlobalRouteManagerImplTestSuite::GlobalRouteManagerImplTestSuite() : TestSuite("global-route-manager-impl", UNIT) { - AddTestCase(new GlobalRouteManagerImplTestCase(), TestCase::QUICK); + AddTestCase(new GlobalRouteManagerImplTestCase(), TestCase::Duration::QUICK); } static GlobalRouteManagerImplTestSuite diff --git a/src/internet/test/icmp-test.cc b/src/internet/test/icmp-test.cc index 964348056..c293b2f3c 100644 --- a/src/internet/test/icmp-test.cc +++ b/src/internet/test/icmp-test.cc @@ -666,10 +666,10 @@ class IcmpTestSuite : public TestSuite IcmpTestSuite::IcmpTestSuite() : TestSuite("icmp", UNIT) { - AddTestCase(new IcmpEchoReplyTestCase, TestCase::QUICK); - AddTestCase(new IcmpTimeExceedTestCase, TestCase::QUICK); - AddTestCase(new IcmpV6EchoReplyTestCase, TestCase::QUICK); - AddTestCase(new IcmpV6TimeExceedTestCase, TestCase::QUICK); + AddTestCase(new IcmpEchoReplyTestCase, TestCase::Duration::QUICK); + AddTestCase(new IcmpTimeExceedTestCase, TestCase::Duration::QUICK); + AddTestCase(new IcmpV6EchoReplyTestCase, TestCase::Duration::QUICK); + AddTestCase(new IcmpV6TimeExceedTestCase, TestCase::Duration::QUICK); } static IcmpTestSuite icmpTestSuite; //!< Static variable for test initialization diff --git a/src/internet/test/internet-stack-helper-test-suite.cc b/src/internet/test/internet-stack-helper-test-suite.cc index 367ae3947..2387d6594 100644 --- a/src/internet/test/internet-stack-helper-test-suite.cc +++ b/src/internet/test/internet-stack-helper-test-suite.cc @@ -150,7 +150,7 @@ class InternetStackHelperTestSuite : public TestSuite InternetStackHelperTestSuite() : TestSuite("internet-stack-helper", UNIT) { - AddTestCase(new InternetStackHelperTestCase(), TestCase::QUICK); + 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 7702b948c..c8e219b85 100644 --- a/src/internet/test/ipv4-address-generator-test-suite.cc +++ b/src/internet/test/ipv4-address-generator-test-suite.cc @@ -365,11 +365,11 @@ class Ipv4AddressGeneratorTestSuite : public TestSuite Ipv4AddressGeneratorTestSuite::Ipv4AddressGeneratorTestSuite() : TestSuite("ipv4-address-generator", UNIT) { - AddTestCase(new NetworkNumberAllocatorTestCase(), TestCase::QUICK); - AddTestCase(new AddressAllocatorTestCase(), TestCase::QUICK); - AddTestCase(new NetworkAndAddressTestCase(), TestCase::QUICK); - AddTestCase(new ExampleAddressGeneratorTestCase(), TestCase::QUICK); - AddTestCase(new AddressCollisionTestCase(), TestCase::QUICK); + AddTestCase(new NetworkNumberAllocatorTestCase(), TestCase::Duration::QUICK); + AddTestCase(new AddressAllocatorTestCase(), TestCase::Duration::QUICK); + AddTestCase(new NetworkAndAddressTestCase(), TestCase::Duration::QUICK); + AddTestCase(new ExampleAddressGeneratorTestCase(), TestCase::Duration::QUICK); + AddTestCase(new AddressCollisionTestCase(), TestCase::Duration::QUICK); } static Ipv4AddressGeneratorTestSuite diff --git a/src/internet/test/ipv4-address-helper-test-suite.cc b/src/internet/test/ipv4-address-helper-test-suite.cc index c7ba89925..2db967fa2 100644 --- a/src/internet/test/ipv4-address-helper-test-suite.cc +++ b/src/internet/test/ipv4-address-helper-test-suite.cc @@ -291,10 +291,10 @@ class Ipv4AddressHelperTestSuite : public TestSuite Ipv4AddressHelperTestSuite::Ipv4AddressHelperTestSuite() : TestSuite("ipv4-address-helper", UNIT) { - AddTestCase(new NetworkAllocatorHelperTestCase(), TestCase::QUICK); - AddTestCase(new AddressAllocatorHelperTestCase(), TestCase::QUICK); - AddTestCase(new ResetAllocatorHelperTestCase(), TestCase::QUICK); - AddTestCase(new IpAddressHelperTestCasev4(), TestCase::QUICK); + AddTestCase(new NetworkAllocatorHelperTestCase(), TestCase::Duration::QUICK); + AddTestCase(new AddressAllocatorHelperTestCase(), TestCase::Duration::QUICK); + AddTestCase(new ResetAllocatorHelperTestCase(), TestCase::Duration::QUICK); + AddTestCase(new IpAddressHelperTestCasev4(), TestCase::Duration::QUICK); } static Ipv4AddressHelperTestSuite diff --git a/src/internet/test/ipv4-deduplication-test.cc b/src/internet/test/ipv4-deduplication-test.cc index 90b9b5b36..418edb702 100644 --- a/src/internet/test/ipv4-deduplication-test.cc +++ b/src/internet/test/ipv4-deduplication-test.cc @@ -559,10 +559,10 @@ class Ipv4DeduplicationTestSuite : public TestSuite Ipv4DeduplicationTestSuite::Ipv4DeduplicationTestSuite() : TestSuite("ipv4-deduplication", UNIT) { - AddTestCase(new Ipv4DeduplicationTest(true), TestCase::QUICK); - AddTestCase(new Ipv4DeduplicationTest(false), TestCase::QUICK); + AddTestCase(new Ipv4DeduplicationTest(true), TestCase::Duration::QUICK); + AddTestCase(new Ipv4DeduplicationTest(false), TestCase::Duration::QUICK); // degenerate case is enabled RFC but with too short an expiry - AddTestCase(new Ipv4DeduplicationTest(true, MicroSeconds(50)), TestCase::QUICK); + AddTestCase(new Ipv4DeduplicationTest(true, MicroSeconds(50)), TestCase::Duration::QUICK); } static Ipv4DeduplicationTestSuite @@ -739,7 +739,7 @@ class Ipv4DeduplicationPerformanceTestSuite : public TestSuite Ipv4DeduplicationPerformanceTestSuite::Ipv4DeduplicationPerformanceTestSuite() : TestSuite("ipv4-deduplication-performance", PERFORMANCE) { - AddTestCase(new Ipv4DeduplicationPerformanceTest, TestCase::EXTENSIVE); + AddTestCase(new Ipv4DeduplicationPerformanceTest, TestCase::Duration::EXTENSIVE); } static Ipv4DeduplicationPerformanceTestSuite diff --git a/src/internet/test/ipv4-forwarding-test.cc b/src/internet/test/ipv4-forwarding-test.cc index 1fbeeb809..986a0b8f6 100644 --- a/src/internet/test/ipv4-forwarding-test.cc +++ b/src/internet/test/ipv4-forwarding-test.cc @@ -240,7 +240,7 @@ class Ipv4ForwardingTestSuite : public TestSuite Ipv4ForwardingTestSuite::Ipv4ForwardingTestSuite() : TestSuite("ipv4-forwarding", UNIT) { - AddTestCase(new Ipv4ForwardingTest, TestCase::QUICK); + AddTestCase(new Ipv4ForwardingTest, TestCase::Duration::QUICK); } static Ipv4ForwardingTestSuite diff --git a/src/internet/test/ipv4-fragmentation-test.cc b/src/internet/test/ipv4-fragmentation-test.cc index 3dee46df2..2c4209f57 100644 --- a/src/internet/test/ipv4-fragmentation-test.cc +++ b/src/internet/test/ipv4-fragmentation-test.cc @@ -589,8 +589,8 @@ class Ipv4FragmentationTestSuite : public TestSuite Ipv4FragmentationTestSuite::Ipv4FragmentationTestSuite() : TestSuite("ipv4-fragmentation", UNIT) { - AddTestCase(new Ipv4FragmentationTest(false), TestCase::QUICK); - AddTestCase(new Ipv4FragmentationTest(true), TestCase::QUICK); + AddTestCase(new Ipv4FragmentationTest(false), TestCase::Duration::QUICK); + AddTestCase(new Ipv4FragmentationTest(true), TestCase::Duration::QUICK); } static Ipv4FragmentationTestSuite diff --git a/src/internet/test/ipv4-global-routing-test-suite.cc b/src/internet/test/ipv4-global-routing-test-suite.cc index 9498512fa..3537becbf 100644 --- a/src/internet/test/ipv4-global-routing-test-suite.cc +++ b/src/internet/test/ipv4-global-routing-test-suite.cc @@ -1325,14 +1325,14 @@ class Ipv4GlobalRoutingTestSuite : public TestSuite Ipv4GlobalRoutingTestSuite::Ipv4GlobalRoutingTestSuite() : TestSuite("ipv4-global-routing", UNIT) { - AddTestCase(new LinkTest, TestCase::QUICK); - AddTestCase(new LanTest, TestCase::QUICK); - AddTestCase(new TwoLinkTest, TestCase::QUICK); - AddTestCase(new TwoLanTest, TestCase::QUICK); - AddTestCase(new BridgeTest, TestCase::QUICK); - AddTestCase(new TwoBridgeTest, TestCase::QUICK); - AddTestCase(new Ipv4DynamicGlobalRoutingTestCase, TestCase::QUICK); - AddTestCase(new Ipv4GlobalRoutingSlash32TestCase, TestCase::QUICK); + AddTestCase(new LinkTest, TestCase::Duration::QUICK); + AddTestCase(new LanTest, TestCase::Duration::QUICK); + AddTestCase(new TwoLinkTest, TestCase::Duration::QUICK); + AddTestCase(new TwoLanTest, TestCase::Duration::QUICK); + AddTestCase(new BridgeTest, TestCase::Duration::QUICK); + AddTestCase(new TwoBridgeTest, TestCase::Duration::QUICK); + AddTestCase(new Ipv4DynamicGlobalRoutingTestCase, TestCase::Duration::QUICK); + AddTestCase(new Ipv4GlobalRoutingSlash32TestCase, TestCase::Duration::QUICK); } static Ipv4GlobalRoutingTestSuite diff --git a/src/internet/test/ipv4-header-test.cc b/src/internet/test/ipv4-header-test.cc index ad632bdec..daafd402e 100644 --- a/src/internet/test/ipv4-header-test.cc +++ b/src/internet/test/ipv4-header-test.cc @@ -301,7 +301,7 @@ class Ipv4HeaderTestSuite : public TestSuite Ipv4HeaderTestSuite() : TestSuite("ipv4-header", UNIT) { - AddTestCase(new Ipv4HeaderTest, TestCase::QUICK); + 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 290a8490e..dab9bd85b 100644 --- a/src/internet/test/ipv4-list-routing-test-suite.cc +++ b/src/internet/test/ipv4-list-routing-test-suite.cc @@ -211,8 +211,8 @@ class Ipv4ListRoutingTestSuite : public TestSuite Ipv4ListRoutingTestSuite() : TestSuite("ipv4-list-routing", UNIT) { - AddTestCase(new Ipv4ListRoutingPositiveTestCase(), TestCase::QUICK); - AddTestCase(new Ipv4ListRoutingNegativeTestCase(), TestCase::QUICK); + 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 9af127cbb..a68cf94c5 100644 --- a/src/internet/test/ipv4-packet-info-tag-test-suite.cc +++ b/src/internet/test/ipv4-packet-info-tag-test-suite.cc @@ -222,7 +222,7 @@ class Ipv4PacketInfoTagTestSuite : public TestSuite Ipv4PacketInfoTagTestSuite::Ipv4PacketInfoTagTestSuite() : TestSuite("ipv4-packet-info-tag", UNIT) { - AddTestCase(new Ipv4PacketInfoTagTest(), TestCase::QUICK); + AddTestCase(new Ipv4PacketInfoTagTest(), TestCase::Duration::QUICK); } static Ipv4PacketInfoTagTestSuite g_packetinfotagTests; //!< Static variable for test initialization diff --git a/src/internet/test/ipv4-raw-test.cc b/src/internet/test/ipv4-raw-test.cc index 3e90f67c2..720646386 100644 --- a/src/internet/test/ipv4-raw-test.cc +++ b/src/internet/test/ipv4-raw-test.cc @@ -380,7 +380,7 @@ class Ipv4RawTestSuite : public TestSuite Ipv4RawTestSuite() : TestSuite("ipv4-raw", UNIT) { - AddTestCase(new Ipv4RawSocketImplTest, TestCase::QUICK); + 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 010236c13..3087d4b91 100644 --- a/src/internet/test/ipv4-rip-test.cc +++ b/src/internet/test/ipv4-rip-test.cc @@ -705,11 +705,14 @@ class Ipv4RipTestSuite : public TestSuite Ipv4RipTestSuite() : TestSuite("ipv4-rip", UNIT) { - AddTestCase(new Ipv4RipTest, TestCase::QUICK); - AddTestCase(new Ipv4RipCountToInfinityTest, TestCase::QUICK); - AddTestCase(new Ipv4RipSplitHorizonStrategyTest(Rip::POISON_REVERSE), TestCase::QUICK); - AddTestCase(new Ipv4RipSplitHorizonStrategyTest(Rip::SPLIT_HORIZON), TestCase::QUICK); - AddTestCase(new Ipv4RipSplitHorizonStrategyTest(Rip::NO_SPLIT_HORIZON), TestCase::QUICK); + AddTestCase(new Ipv4RipTest, TestCase::Duration::QUICK); + AddTestCase(new Ipv4RipCountToInfinityTest, TestCase::Duration::QUICK); + AddTestCase(new Ipv4RipSplitHorizonStrategyTest(Rip::POISON_REVERSE), + TestCase::Duration::QUICK); + AddTestCase(new Ipv4RipSplitHorizonStrategyTest(Rip::SPLIT_HORIZON), + TestCase::Duration::QUICK); + AddTestCase(new Ipv4RipSplitHorizonStrategyTest(Rip::NO_SPLIT_HORIZON), + 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 0ae1d94af..a4c1f9dc2 100644 --- a/src/internet/test/ipv4-static-routing-test-suite.cc +++ b/src/internet/test/ipv4-static-routing-test-suite.cc @@ -221,7 +221,7 @@ class Ipv4StaticRoutingTestSuite : public TestSuite Ipv4StaticRoutingTestSuite::Ipv4StaticRoutingTestSuite() : TestSuite("ipv4-static-routing", UNIT) { - AddTestCase(new Ipv4StaticRoutingSlash32TestCase, TestCase::QUICK); + AddTestCase(new Ipv4StaticRoutingSlash32TestCase, TestCase::Duration::QUICK); } static Ipv4StaticRoutingTestSuite diff --git a/src/internet/test/ipv4-test.cc b/src/internet/test/ipv4-test.cc index 53c59cbf3..88444cfef 100644 --- a/src/internet/test/ipv4-test.cc +++ b/src/internet/test/ipv4-test.cc @@ -131,7 +131,7 @@ class IPv4L3ProtocolTestSuite : public TestSuite IPv4L3ProtocolTestSuite() : TestSuite("ipv4-protocol", UNIT) { - AddTestCase(new Ipv4L3ProtocolTestCase(), TestCase::QUICK); + 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 d1c514294..9f1fea227 100644 --- a/src/internet/test/ipv6-address-duplication-test.cc +++ b/src/internet/test/ipv6-address-duplication-test.cc @@ -126,7 +126,7 @@ class Ipv6DadTestSuite : public TestSuite Ipv6DadTestSuite() : TestSuite("ipv6-duplicate-address-detection", UNIT) { - AddTestCase(new Ipv6DadTest, TestCase::QUICK); + AddTestCase(new Ipv6DadTest, TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/ipv6-address-generator-test-suite.cc b/src/internet/test/ipv6-address-generator-test-suite.cc index cfad9ef01..827fd83e4 100644 --- a/src/internet/test/ipv6-address-generator-test-suite.cc +++ b/src/internet/test/ipv6-address-generator-test-suite.cc @@ -352,11 +352,11 @@ class Ipv6AddressGeneratorTestSuite : public TestSuite Ipv6AddressGeneratorTestSuite() : TestSuite("ipv6-address-generator") { - AddTestCase(new NetworkNumber6AllocatorTestCase(), TestCase::QUICK); - AddTestCase(new AddressAllocator6TestCase(), TestCase::QUICK); - AddTestCase(new NetworkAndAddress6TestCase(), TestCase::QUICK); - AddTestCase(new ExampleAddress6GeneratorTestCase(), TestCase::QUICK); - AddTestCase(new AddressCollision6TestCase(), TestCase::QUICK); + AddTestCase(new NetworkNumber6AllocatorTestCase(), TestCase::Duration::QUICK); + AddTestCase(new AddressAllocator6TestCase(), TestCase::Duration::QUICK); + AddTestCase(new NetworkAndAddress6TestCase(), TestCase::Duration::QUICK); + AddTestCase(new ExampleAddress6GeneratorTestCase(), TestCase::Duration::QUICK); + AddTestCase(new AddressCollision6TestCase(), 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 bbea29d0c..4a6e41a9b 100644 --- a/src/internet/test/ipv6-address-helper-test-suite.cc +++ b/src/internet/test/ipv6-address-helper-test-suite.cc @@ -181,7 +181,7 @@ class Ipv6AddressHelperTestSuite : public TestSuite Ipv6AddressHelperTestSuite::Ipv6AddressHelperTestSuite() : TestSuite("ipv6-address-helper", UNIT) { - AddTestCase(new IpAddressHelperTestCasev6, TestCase::QUICK); + AddTestCase(new IpAddressHelperTestCasev6, TestCase::Duration::QUICK); } static Ipv6AddressHelperTestSuite diff --git a/src/internet/test/ipv6-dual-stack-test-suite.cc b/src/internet/test/ipv6-dual-stack-test-suite.cc index 54716c2e4..816c17838 100644 --- a/src/internet/test/ipv6-dual-stack-test-suite.cc +++ b/src/internet/test/ipv6-dual-stack-test-suite.cc @@ -362,7 +362,7 @@ class Ipv6DualStackTestSuite : public TestSuite Ipv6DualStackTestSuite() : TestSuite("ipv6-dual-stack", UNIT) { - AddTestCase(new DualStackTestCase(), TestCase::QUICK); + 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 215292a45..d5ee11e93 100644 --- a/src/internet/test/ipv6-extension-header-test-suite.cc +++ b/src/internet/test/ipv6-extension-header-test-suite.cc @@ -281,10 +281,10 @@ class Ipv6ExtensionHeaderTestSuite : public TestSuite Ipv6ExtensionHeaderTestSuite() : TestSuite("ipv6-extension-header", UNIT) { - AddTestCase(new TestEmptyOptionField, TestCase::QUICK); - AddTestCase(new TestOptionWithoutAlignment, TestCase::QUICK); - AddTestCase(new TestOptionWithAlignment, TestCase::QUICK); - AddTestCase(new TestFulfilledAlignment, TestCase::QUICK); + AddTestCase(new TestEmptyOptionField, TestCase::Duration::QUICK); + AddTestCase(new TestOptionWithoutAlignment, TestCase::Duration::QUICK); + AddTestCase(new TestOptionWithAlignment, TestCase::Duration::QUICK); + AddTestCase(new TestFulfilledAlignment, TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/ipv6-forwarding-test.cc b/src/internet/test/ipv6-forwarding-test.cc index 54eda9b84..6cf552977 100644 --- a/src/internet/test/ipv6-forwarding-test.cc +++ b/src/internet/test/ipv6-forwarding-test.cc @@ -220,7 +220,7 @@ class Ipv6ForwardingTestSuite : public TestSuite Ipv6ForwardingTestSuite() : TestSuite("ipv6-forwarding", UNIT) { - AddTestCase(new Ipv6ForwardingTest, TestCase::QUICK); + 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 15b52375d..89d945c77 100644 --- a/src/internet/test/ipv6-fragmentation-test.cc +++ b/src/internet/test/ipv6-fragmentation-test.cc @@ -625,7 +625,7 @@ class Ipv6FragmentationTestSuite : public TestSuite Ipv6FragmentationTestSuite() : TestSuite("ipv6-fragmentation", UNIT) { - AddTestCase(new Ipv6FragmentationTest, TestCase::QUICK); + 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 181a578ee..c35d79fee 100644 --- a/src/internet/test/ipv6-list-routing-test-suite.cc +++ b/src/internet/test/ipv6-list-routing-test-suite.cc @@ -240,8 +240,8 @@ class Ipv6ListRoutingTestSuite : public TestSuite Ipv6ListRoutingTestSuite() : TestSuite("ipv6-list-routing", UNIT) { - AddTestCase(new Ipv6ListRoutingPositiveTestCase(), TestCase::QUICK); - AddTestCase(new Ipv6ListRoutingNegativeTestCase(), TestCase::QUICK); + 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 b77474f26..8e2e08c17 100644 --- a/src/internet/test/ipv6-packet-info-tag-test-suite.cc +++ b/src/internet/test/ipv6-packet-info-tag-test-suite.cc @@ -258,7 +258,7 @@ class Ipv6PacketInfoTagTestSuite : public TestSuite Ipv6PacketInfoTagTestSuite::Ipv6PacketInfoTagTestSuite() : TestSuite("ipv6-packet-info-tag", UNIT) { - AddTestCase(new Ipv6PacketInfoTagTest(), TestCase::QUICK); + AddTestCase(new Ipv6PacketInfoTagTest(), TestCase::Duration::QUICK); } static Ipv6PacketInfoTagTestSuite g_packetinfotagTests; //!< Static variable for test initialization diff --git a/src/internet/test/ipv6-raw-test.cc b/src/internet/test/ipv6-raw-test.cc index aeda29c8d..a5422003c 100644 --- a/src/internet/test/ipv6-raw-test.cc +++ b/src/internet/test/ipv6-raw-test.cc @@ -332,7 +332,7 @@ class Ipv6RawTestSuite : public TestSuite Ipv6RawTestSuite() : TestSuite("ipv6-raw", UNIT) { - AddTestCase(new Ipv6RawSocketImplTest, TestCase::QUICK); + 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 c378a9ef9..7579c57ed 100644 --- a/src/internet/test/ipv6-ripng-test.cc +++ b/src/internet/test/ipv6-ripng-test.cc @@ -704,12 +704,14 @@ class Ipv6RipngTestSuite : public TestSuite Ipv6RipngTestSuite() : TestSuite("ipv6-ripng", UNIT) { - AddTestCase(new Ipv6RipngTest, TestCase::QUICK); - AddTestCase(new Ipv6RipngCountToInfinityTest, TestCase::QUICK); - AddTestCase(new Ipv6RipngSplitHorizonStrategyTest(RipNg::POISON_REVERSE), TestCase::QUICK); - AddTestCase(new Ipv6RipngSplitHorizonStrategyTest(RipNg::SPLIT_HORIZON), TestCase::QUICK); + AddTestCase(new Ipv6RipngTest, TestCase::Duration::QUICK); + AddTestCase(new Ipv6RipngCountToInfinityTest, TestCase::Duration::QUICK); + AddTestCase(new Ipv6RipngSplitHorizonStrategyTest(RipNg::POISON_REVERSE), + TestCase::Duration::QUICK); + AddTestCase(new Ipv6RipngSplitHorizonStrategyTest(RipNg::SPLIT_HORIZON), + TestCase::Duration::QUICK); AddTestCase(new Ipv6RipngSplitHorizonStrategyTest(RipNg::NO_SPLIT_HORIZON), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/ipv6-test.cc b/src/internet/test/ipv6-test.cc index fff151684..7a73a0817 100644 --- a/src/internet/test/ipv6-test.cc +++ b/src/internet/test/ipv6-test.cc @@ -188,7 +188,7 @@ class IPv6L3ProtocolTestSuite : public TestSuite IPv6L3ProtocolTestSuite() : TestSuite("ipv6-protocol", UNIT) { - AddTestCase(new Ipv6L3ProtocolTestCase(), TestCase::QUICK); + 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 0e2438b85..c346548bc 100644 --- a/src/internet/test/neighbor-cache-test.cc +++ b/src/internet/test/neighbor-cache-test.cc @@ -1232,13 +1232,13 @@ class NeighborCacheTestSuite : public TestSuite NeighborCacheTestSuite() : TestSuite("neighbor-cache", UNIT) { - AddTestCase(new DynamicNeighborCacheTest, TestCase::QUICK); - AddTestCase(new ChannelTest, TestCase::QUICK); - AddTestCase(new NetDeviceContainerTest, TestCase::QUICK); - AddTestCase(new InterfaceContainerTest, TestCase::QUICK); - AddTestCase(new FlushTest, TestCase::QUICK); - AddTestCase(new DuplicateTest, TestCase::QUICK); - AddTestCase(new DynamicPartialTest, TestCase::QUICK); + AddTestCase(new DynamicNeighborCacheTest, TestCase::Duration::QUICK); + AddTestCase(new ChannelTest, TestCase::Duration::QUICK); + AddTestCase(new NetDeviceContainerTest, TestCase::Duration::QUICK); + AddTestCase(new InterfaceContainerTest, TestCase::Duration::QUICK); + AddTestCase(new FlushTest, TestCase::Duration::QUICK); + AddTestCase(new DuplicateTest, TestCase::Duration::QUICK); + AddTestCase(new DynamicPartialTest, TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/rtt-test.cc b/src/internet/test/rtt-test.cc index 4860f57f3..b37f0d9b4 100644 --- a/src/internet/test/rtt-test.cc +++ b/src/internet/test/rtt-test.cc @@ -189,7 +189,7 @@ class RttEstimatorTestSuite : public TestSuite RttEstimatorTestSuite() : TestSuite("rtt-estimator", UNIT) { - AddTestCase(new RttEstimatorTestCase, TestCase::QUICK); + 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 a3bf259e4..c6ff766c1 100644 --- a/src/internet/test/tcp-advertised-window-test.cc +++ b/src/internet/test/tcp-advertised-window-test.cc @@ -479,33 +479,33 @@ class TcpAdvertisedWindowTestSuite : public TestSuite 500, 100, 0.0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpAdvertisedWindowTest("TCP advertised window size, small seg + loss", 500, 100, 0.1), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpAdvertisedWindowTest("TCP advertised window size, large seg + no loss", 1000, 100, 0.0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpAdvertisedWindowTest("TCP advertised window size, large seg + small loss", 1000, 100, 0.1), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpAdvertisedWindowTest("TCP advertised window size, large seg + big loss", 1000, 100, 0.3), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpAdvertisedWindowTest("TCP advertised window size, complete loss", 1000, 100, 1.0), - TestCase::QUICK); + TestCase::Duration::QUICK); std::vector toDrop; toDrop.push_back(8001); diff --git a/src/internet/test/tcp-bbr-test.cc b/src/internet/test/tcp-bbr-test.cc index d5a883ca7..cd3876658 100644 --- a/src/internet/test/tcp-bbr-test.cc +++ b/src/internet/test/tcp-bbr-test.cc @@ -195,37 +195,37 @@ class TcpBbrTestSuite : public TestSuite : TestSuite("tcp-bbr-test", UNIT) { AddTestCase(new TcpBbrPacingEnableTest(true, "BBR must keep pacing feature on"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpBbrPacingEnableTest(false, "BBR must turn on pacing feature"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpBbrCheckGainValuesTest( TcpBbr::BBR_STARTUP, 4, "BBR should enter to STARTUP phase and set cwnd and pacing gain accordingly"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpBbrCheckGainValuesTest( TcpBbr::BBR_DRAIN, 4, "BBR should enter to DRAIN phase and set cwnd and pacing gain accordingly"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpBbrCheckGainValuesTest( TcpBbr::BBR_PROBE_BW, 4, "BBR should enter to BBR_PROBE_BW phase and set cwnd and pacing gain accordingly"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpBbrCheckGainValuesTest( TcpBbr::BBR_PROBE_RTT, 4, "BBR should enter to BBR_PROBE_RTT phase and set cwnd and pacing gain accordingly"), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-bic-test.cc b/src/internet/test/tcp-bic-test.cc index a36c512ad..8e1648a52 100644 --- a/src/internet/test/tcp-bic-test.cc +++ b/src/internet/test/tcp-bic-test.cc @@ -319,7 +319,7 @@ class TcpBicTestSuite : public TestSuite 11, 0, "Bic increment test: under lowCwnd & enough ACKs received"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpBicIncrementTest( 10 * 536, 536, @@ -327,7 +327,7 @@ class TcpBicTestSuite : public TestSuite 8, 0, "Bic increment test: under lowCwnd but not enough ACKs received"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpBicIncrementTest( 18 * 1446, 1446, @@ -335,7 +335,7 @@ class TcpBicTestSuite : public TestSuite 5, 90, "Bic increment test: linear increase when distance exceeds S_max"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpBicIncrementTest(18 * 1446, 1446, @@ -343,21 +343,21 @@ class TcpBicTestSuite : public TestSuite 24, 20, "Bic increment test: binary search increase with smooth part"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpBicIncrementTest(19 * 1, 1, 17 * 1, 2, 83, "Bic increment test: binary search increase"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpBicIncrementTest(15 * 536, 536, 9 * 536, 19, 13, "Bic increment test: slow start AMD linear increase"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpBicIncrementTest(22 * 1000, 1000, @@ -365,7 +365,7 @@ class TcpBicTestSuite : public TestSuite 9, 16, "Bic increment test: slow start but not enough ACKs received"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpBicIncrementTest( 65 * 1000, 1000, @@ -373,7 +373,7 @@ class TcpBicTestSuite : public TestSuite 2, 16, "Bic increment test: linear incrase but not enough ACKs received"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpBicDecrementTest( 5 * 1446, @@ -381,14 +381,14 @@ class TcpBicTestSuite : public TestSuite true, 10, "Bic decrement test: fast convergence & cwnd less than lowWindow"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpBicDecrementTest( 5 * 1446, 1446, false, 10, "Bic decrement test: not in fast convergence & cwnd less than lowWindow"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpBicDecrementTest( 15 * 1446, @@ -396,7 +396,7 @@ class TcpBicTestSuite : public TestSuite false, 10, "Bic decrement test: not in fast convergence & cwnd greater than lowWindow"), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-bytes-in-flight-test.cc b/src/internet/test/tcp-bytes-in-flight-test.cc index 526aedf33..a799b8af3 100644 --- a/src/internet/test/tcp-bytes-in-flight-test.cc +++ b/src/internet/test/tcp-bytes-in-flight-test.cc @@ -293,20 +293,20 @@ class TcpBytesInFlightTestSuite : public TestSuite { std::vector toDrop; AddTestCase(new TcpBytesInFlightTest("BytesInFlight value, no drop", toDrop), - TestCase::QUICK); + TestCase::Duration::QUICK); toDrop.push_back(4001); AddTestCase(new TcpBytesInFlightTest("BytesInFlight value, one drop", toDrop), - TestCase::QUICK); + TestCase::Duration::QUICK); toDrop.push_back(4001); AddTestCase( new TcpBytesInFlightTest("BytesInFlight value, two drop of same segment", toDrop), - TestCase::QUICK); + TestCase::Duration::QUICK); toDrop.pop_back(); toDrop.push_back(4501); AddTestCase( new TcpBytesInFlightTest("BytesInFlight value, two drop of consecutive segments", toDrop), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-classic-recovery-test.cc b/src/internet/test/tcp-classic-recovery-test.cc index 5227bafaf..8491b703a 100644 --- a/src/internet/test/tcp-classic-recovery-test.cc +++ b/src/internet/test/tcp-classic-recovery-test.cc @@ -133,37 +133,37 @@ class ClassicRecoveryTestSuite : public TestSuite 2500, 3, "Classic recovery test with 500 bytes segmentSize"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ClassicRecoveryTest(3000, 1000, 2500, 3, "Classic recovery test with 1000 bytes segmentSize"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ClassicRecoveryTest(3000, 500, 2500, 4, "Classic recovery test with 4 DupAck threshold"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ClassicRecoveryTest(3000, 500, 1000, 3, "Classic recovery test with 1000 bytes ssThresh"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ClassicRecoveryTest(2500, 500, 2500, 3, "Classic recovery test with same cWnd and ssThresh"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ClassicRecoveryTest(1000, 500, 2500, 3, "Classic recovery test with cWnd lesser than ssThresh"), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-close-test.cc b/src/internet/test/tcp-close-test.cc index 9fb725b4e..013c6d21b 100644 --- a/src/internet/test/tcp-close-test.cc +++ b/src/internet/test/tcp-close-test.cc @@ -161,8 +161,8 @@ class TcpTcpCloseTestSuite : public TestSuite TcpTcpCloseTestSuite() : TestSuite("tcp-close", UNIT) { - AddTestCase(new TcpCloseWithLossTestCase(true), TestCase::QUICK); - AddTestCase(new TcpCloseWithLossTestCase(false), TestCase::QUICK); + 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 ac2d0f9d3..1514175ca 100644 --- a/src/internet/test/tcp-cong-avoid-test.cc +++ b/src/internet/test/tcp-cong-avoid-test.cc @@ -205,14 +205,14 @@ class TcpRenoCongAvoidTestSuite : public TestSuite t, "cong avoid MSS=500, pkt_size=500," + typeName), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpNewRenoCongAvoidNormalTest(500, 1000, i, t, "cong avoid MSS=500, pkt_size=1000," + typeName), - TestCase::QUICK); + TestCase::Duration::QUICK); } } } diff --git a/src/internet/test/tcp-datasentcb-test.cc b/src/internet/test/tcp-datasentcb-test.cc index 9c973914d..9acbeb1f8 100644 --- a/src/internet/test/tcp-datasentcb-test.cc +++ b/src/internet/test/tcp-datasentcb-test.cc @@ -172,15 +172,15 @@ class TcpDataSentCbTestSuite : public TestSuite : TestSuite("tcp-datasentcb", UNIT) { AddTestCase(new TcpDataSentCbTestCase("Check the data sent callback", 500, 10), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpDataSentCbTestCase("Check the data sent callback", 100, 100), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpDataSentCbTestCase("Check the data sent callback", 1000, 50), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpDataSentCbTestCase("Check the data sent callback", 855, 18), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpDataSentCbTestCase("Check the data sent callback", 1243, 59), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-dctcp-test.cc b/src/internet/test/tcp-dctcp-test.cc index 3c1028a46..529cac7a2 100644 --- a/src/internet/test/tcp-dctcp-test.cc +++ b/src/internet/test/tcp-dctcp-test.cc @@ -669,20 +669,20 @@ class TcpDctcpTestSuite : public TestSuite SequenceNumber32(3216), MilliSeconds(100), "DCTCP falls to New Reno for slowstart"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpDctcpCodePointsTest(1, "ECT Test : Check if ECT is set on Syn, Syn+Ack, " "Ack and Data packets for DCTCP packets"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpDctcpCodePointsTest( 2, "ECT Test : Check if ECT is not set on Syn, Syn+Ack and Ack but set on " "Data packets for non-DCTCP but ECN enabled traffic"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpDctcpCodePointsTest(3, "ECE Functionality Test: ECE should only be sent by " "receiver when it receives CE flags"), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-ecn-test.cc b/src/internet/test/tcp-ecn-test.cc index c35393c9d..a84c3b5d4 100644 --- a/src/internet/test/tcp-ecn-test.cc +++ b/src/internet/test/tcp-ecn-test.cc @@ -590,28 +590,28 @@ class TcpEcnTestSuite : public TestSuite AddTestCase(new TcpEcnTest( 1, "ECN Negotiation Test : ECN incapable sender and ECN incapable receiver"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpEcnTest(2, "ECN Negotiation Test : ECN capable sender and ECN incapable receiver"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpEcnTest(3, "ECN Negotiation Test : ECN incapable sender and ECN capable receiver"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpEcnTest(4, "ECN Negotiation Test : ECN capable sender and ECN capable receiver"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpEcnTest( 5, "ECE and CWR Functionality Test: ECN capable sender and ECN capable receiver"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpEcnTest( 6, "Congestion Window Reduction Test :ECN capable sender and ECN capable receiver"), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-endpoint-bug2211.cc b/src/internet/test/tcp-endpoint-bug2211.cc index 026938629..2d4619794 100644 --- a/src/internet/test/tcp-endpoint-bug2211.cc +++ b/src/internet/test/tcp-endpoint-bug2211.cc @@ -159,8 +159,10 @@ class TcpEndpointBug2211TestSuite : public TestSuite TcpEndpointBug2211TestSuite() : TestSuite("tcp-endpoint-bug2211-test", UNIT) { - AddTestCase(new TcpEndPointBug2211Test("Bug 2211 testcase IPv4", false), TestCase::QUICK); - AddTestCase(new TcpEndPointBug2211Test("Bug 2211 testcase IPv6", true), TestCase::QUICK); + AddTestCase(new TcpEndPointBug2211Test("Bug 2211 testcase IPv4", false), + TestCase::Duration::QUICK); + AddTestCase(new TcpEndPointBug2211Test("Bug 2211 testcase IPv6", true), + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-fast-retr-test.cc b/src/internet/test/tcp-fast-retr-test.cc index fb8ee33fd..9020b1c99 100644 --- a/src/internet/test/tcp-fast-retr-test.cc +++ b/src/internet/test/tcp-fast-retr-test.cc @@ -446,7 +446,7 @@ class TcpFastRetrTestSuite : public TestSuite for (auto it = types.begin(); it != types.end(); ++it) { AddTestCase(new TcpFastRetrTest((*it), 5001, "Fast Retransmit testing"), - TestCase::QUICK); + TestCase::Duration::QUICK); } } }; diff --git a/src/internet/test/tcp-header-test.cc b/src/internet/test/tcp-header-test.cc index e4e75dd5b..c83385d6d 100644 --- a/src/internet/test/tcp-header-test.cc +++ b/src/internet/test/tcp-header-test.cc @@ -462,10 +462,11 @@ class TcpHeaderTestSuite : public TestSuite TcpHeaderTestSuite() : TestSuite("tcp-header", UNIT) { - AddTestCase(new TcpHeaderGetSetTestCase("GetSet test cases"), TestCase::QUICK); + AddTestCase(new TcpHeaderGetSetTestCase("GetSet test cases"), TestCase::Duration::QUICK); AddTestCase(new TcpHeaderWithRFC793OptionTestCase("Test for options in RFC 793"), - TestCase::QUICK); - AddTestCase(new TcpHeaderFlagsToString("Test flags to string function"), TestCase::QUICK); + TestCase::Duration::QUICK); + AddTestCase(new TcpHeaderFlagsToString("Test flags to string function"), + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-highspeed-test.cc b/src/internet/test/tcp-highspeed-test.cc index 0634b2677..292560bc2 100644 --- a/src/internet/test/tcp-highspeed-test.cc +++ b/src/internet/test/tcp-highspeed-test.cc @@ -194,32 +194,32 @@ class TcpHighSpeedTestSuite : public TestSuite new TcpHighSpeedIncrementTest(highSpeedImportantValues[i].cwnd, 1, "Highspeed increment test on cWnd " + ss.str()), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpHighSpeedIncrementTest(highSpeedImportantValues[i].cwnd * 536, 536, "Highspeed increment test on cWnd " + ss.str()), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpHighSpeedIncrementTest(highSpeedImportantValues[i].cwnd * 1446, 1446, "Highspeed increment test on cWnd " + ss.str()), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpHighSpeedDecrementTest(highSpeedImportantValues[i].cwnd, 1, "Highspeed Decrement test on cWnd " + ss.str()), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpHighSpeedDecrementTest(highSpeedImportantValues[i].cwnd * 536, 536, "Highspeed Decrement test on cWnd " + ss.str()), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpHighSpeedDecrementTest(highSpeedImportantValues[i].cwnd * 1446, 1446, "Highspeed Decrement test on cWnd " + ss.str()), - TestCase::QUICK); + TestCase::Duration::QUICK); ss.flush(); } } diff --git a/src/internet/test/tcp-htcp-test.cc b/src/internet/test/tcp-htcp-test.cc index df1f4a2d6..cca81b0bd 100644 --- a/src/internet/test/tcp-htcp-test.cc +++ b/src/internet/test/tcp-htcp-test.cc @@ -175,7 +175,7 @@ class TcpHtcpTestSuite : public TestSuite ns3::MilliSeconds(1000), 20383, "TcpHtcp increment test on cWnd "), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpHtcpIncrementTest(38, 1, 100, @@ -184,7 +184,7 @@ class TcpHtcpTestSuite : public TestSuite ns3::MilliSeconds(1100), 40, "TcpHtcp increment test on cWnd "), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpHtcpIncrementTest(53 * 1446, 1446, 50, @@ -193,7 +193,7 @@ class TcpHtcpTestSuite : public TestSuite ns3::MilliSeconds(1500), 76671, "TcpHtcp increment test on cWnd "), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-hybla-test.cc b/src/internet/test/tcp-hybla-test.cc index 4ab82cad5..aa010667f 100644 --- a/src/internet/test/tcp-hybla-test.cc +++ b/src/internet/test/tcp-hybla-test.cc @@ -162,25 +162,25 @@ class TcpHyblaTestSuite : public TestSuite 500, MilliSeconds(55), "Rho=1.1, slow start"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpHyblaIncrementTest(1000, 0xFFFFFFFF, 500, MilliSeconds(100), "Rho=2, slow start"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpHyblaIncrementTest(1000, 0xFFFFFFFF, 500, MilliSeconds(750), "Rho=30, slow start"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpHyblaIncrementTest(1000, 500, 500, Seconds(0.55), "Rho=1.1, cong avoid"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpHyblaIncrementTest(1000, 500, 500, Seconds(0.1), "Rho=2, cong avoid"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpHyblaIncrementTest(1000, 500, 500, Seconds(0.75), "Rho=30, cong avoid"), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-illinois-test.cc b/src/internet/test/tcp-illinois-test.cc index 48a14880b..cbfd95d5b 100644 --- a/src/internet/test/tcp-illinois-test.cc +++ b/src/internet/test/tcp-illinois-test.cc @@ -363,7 +363,7 @@ class TcpIllinoisTestSuite : public TestSuite SequenceNumber32(2893), SequenceNumber32(5785), "Illinois test on cWnd and ssThresh when in slow start"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpIllinoisTest( 60 * 346, 40 * 346, @@ -374,7 +374,7 @@ class TcpIllinoisTestSuite : public TestSuite SequenceNumber32(2893), SequenceNumber32(5785), "Illinois test on cWnd and ssThresh when avg queueing delay is at minimum"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpIllinoisTest( 38 * 1446, 40 * 1446, @@ -385,7 +385,7 @@ class TcpIllinoisTestSuite : public TestSuite SequenceNumber32(2893), SequenceNumber32(5785), "Illinois test on cWnd and ssThresh when avg queueing delay is at maximum"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpIllinoisTest(40 * 1446, 38 * 1446, 1446, @@ -396,7 +396,7 @@ class TcpIllinoisTestSuite : public TestSuite SequenceNumber32(5785), "Illinois test on cWnd and ssThresh when avg queueing " "delay is in between its min & max"), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-ledbat-test.cc b/src/internet/test/tcp-ledbat-test.cc index fa07561ff..f59ae0ff4 100644 --- a/src/internet/test/tcp-ledbat-test.cc +++ b/src/internet/test/tcp-ledbat-test.cc @@ -353,7 +353,7 @@ class TcpLedbatTestSuite : public TestSuite SequenceNumber32(3216), MilliSeconds(100), "LEDBAT falls to New Reno for slowstart"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpLedbatToNewReno(4 * 1446, 1446, 2 * 1446, @@ -362,7 +362,7 @@ class TcpLedbatTestSuite : public TestSuite SequenceNumber32(3216), MilliSeconds(100), "LEDBAT falls to New Reno if timestamps are not found"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpLedbatIncrementTest(2 * 1446, 1446, 4 * 1446, @@ -371,7 +371,7 @@ class TcpLedbatTestSuite : public TestSuite SequenceNumber32(3216), MilliSeconds(100), "LEDBAT increment test"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpLedbatDecrementTest(2 * 1446, 1446, 4 * 1446, @@ -380,7 +380,7 @@ class TcpLedbatTestSuite : public TestSuite SequenceNumber32(3216), MilliSeconds(100), "LEDBAT decrement test"), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-linux-reno-test.cc b/src/internet/test/tcp-linux-reno-test.cc index a8623a9d0..835184f1f 100644 --- a/src/internet/test/tcp-linux-reno-test.cc +++ b/src/internet/test/tcp-linux-reno-test.cc @@ -413,7 +413,7 @@ class TcpLinuxRenoTestSuite : public TestSuite cong_control_type, "Slow Start MSS = 524, socket send size = 524, delack = 1 " + cong_control_type.GetName()), - TestCase::QUICK); + TestCase::Duration::QUICK); // Next, enabling delayed acks should not have an effect on the final // cWnd achieved @@ -427,7 +427,7 @@ class TcpLinuxRenoTestSuite : public TestSuite cong_control_type, "Slow Start MSS = 524, socket send size = 524, delack = 2 " + cong_control_type.GetName()), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test the behavior of Slow Start phase with standard segment size // (1500 bytes) and delayed acknowledgement of 1 and 2 segments @@ -443,7 +443,7 @@ class TcpLinuxRenoTestSuite : public TestSuite cong_control_type, "Slow Start MSS = 1500, socket send size = 524, delack = 1 " + cong_control_type.GetName()), - TestCase::QUICK); + TestCase::Duration::QUICK); // Enable delayed acks; we still expect m_cWnd to end up at 9 segments AddTestCase( @@ -456,7 +456,7 @@ class TcpLinuxRenoTestSuite : public TestSuite cong_control_type, "Slow Start MSS = 1500, socket send size = 524, delack = 2 " + cong_control_type.GetName()), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test the behavior of Congestion Avoidance phase with small segment size // (524 bytes) and delayed acknowledgement of 1 and 2. One important thing @@ -497,7 +497,7 @@ class TcpLinuxRenoTestSuite : public TestSuite cong_control_type, "Congestion Avoidance MSS = 524, socket send size = 524, delack = 1 " + cong_control_type.GetName()), - TestCase::QUICK); + TestCase::Duration::QUICK); // Repeat with delayed acks enabled: should result in same final cWnd // Expected data pattern starting at simulation time 10: @@ -527,7 +527,7 @@ class TcpLinuxRenoTestSuite : public TestSuite cong_control_type, "Congestion Avoidance MSS = 524, socket send size = 524, delack = 2 " + cong_control_type.GetName()), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test the behavior of Congestion Avoidance phase with standard segment size (i.e 1500 // bytes) and delayed acknowledgement of 1 and 2 Test the behavior of Congestion Avoidance @@ -545,7 +545,7 @@ class TcpLinuxRenoTestSuite : public TestSuite cong_control_type, "Congestion Avoidance MSS = 1500, socket send size = 1500, delack = 1 " + cong_control_type.GetName()), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpLinuxRenoCongAvoidTest( 1500, // segment size @@ -558,7 +558,7 @@ class TcpLinuxRenoTestSuite : public TestSuite cong_control_type, "Congestion Avoidance MSS = 1500, socket send size = 1500, delack = 2 " + cong_control_type.GetName()), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-loss-test.cc b/src/internet/test/tcp-loss-test.cc index a06ad96d8..9152f381d 100644 --- a/src/internet/test/tcp-loss-test.cc +++ b/src/internet/test/tcp-loss-test.cc @@ -192,13 +192,13 @@ class TcpLossTestSuite : public TestSuite // the TCP logic should correctly pass this case (no sequence wrapping). AddTestCase( new TcpLargeTransferLossTest(1000, 2000, 2500, "large-transfer-loss-without-wrap"), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // If we force a loss at packet 1000 and then much later at 3294967, the // second sequence number will evaluate to less than 1000 considering // the sequence space wrap, so check this case also. AddTestCase( new TcpLargeTransferLossTest(1000, 3294967, 3295100, "large-transfer-loss-with-wrap"), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); } }; diff --git a/src/internet/test/tcp-lp-test.cc b/src/internet/test/tcp-lp-test.cc index 1dc29e70c..c97c306ae 100644 --- a/src/internet/test/tcp-lp-test.cc +++ b/src/internet/test/tcp-lp-test.cc @@ -270,7 +270,7 @@ class TcpLpTestSuite : public TestSuite 2 * 1446, MilliSeconds(100), "LP falls to New Reno if the cwd is within threshold"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpLpInferenceTest1( 2 * 1446, @@ -278,7 +278,7 @@ class TcpLpTestSuite : public TestSuite 2, MilliSeconds(100), "LP enters Inference phase when cwd exceeds threshold for the first time"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpLpInferenceTest2( 2 * 1446, @@ -286,7 +286,7 @@ class TcpLpTestSuite : public TestSuite 2, MilliSeconds(100), "LP reduces cWnd to 1 if cwd exceeds threshold in inference phase"), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-option-test.cc b/src/internet/test/tcp-option-test.cc index 073ccdb6e..9b57b0d33 100644 --- a/src/internet/test/tcp-option-test.cc +++ b/src/internet/test/tcp-option-test.cc @@ -207,10 +207,11 @@ class TcpOptionTestSuite : public TestSuite { for (uint8_t i = 0; i < 15; ++i) { - AddTestCase(new TcpOptionWSTestCase("Testing window scale value", i), TestCase::QUICK); + AddTestCase(new TcpOptionWSTestCase("Testing window scale value", i), + TestCase::Duration::QUICK); } AddTestCase(new TcpOptionTSTestCase("Testing serialization of random values for timestamp"), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-pacing-test.cc b/src/internet/test/tcp-pacing-test.cc index 5c53212bb..b293ec130 100644 --- a/src/internet/test/tcp-pacing-test.cc +++ b/src/internet/test/tcp-pacing-test.cc @@ -396,7 +396,7 @@ class TcpPacingTestSuite : public TestSuite delAckMaxCount, tid, description), - TestCase::QUICK); + TestCase::Duration::QUICK); paceInitialWindow = true; description = std::string("Pacing case 2: Slow start only, initial pacing"); @@ -410,7 +410,7 @@ class TcpPacingTestSuite : public TestSuite delAckMaxCount, tid, description), - TestCase::QUICK); + TestCase::Duration::QUICK); // set ssThresh to some smaller value to check that pacing // slows down in second half of slow start, then transitions to CA @@ -429,7 +429,7 @@ class TcpPacingTestSuite : public TestSuite delAckMaxCount, tid, description), - TestCase::QUICK); + TestCase::Duration::QUICK); // Repeat tests, but with more typical delAckMaxCount == 2 delAckMaxCount = 2; @@ -448,7 +448,7 @@ class TcpPacingTestSuite : public TestSuite delAckMaxCount, tid, description), - TestCase::QUICK); + TestCase::Duration::QUICK); paceInitialWindow = true; description = std::string("Pacing case 5: Slow start only, initial pacing, delayed ACKs"); @@ -462,7 +462,7 @@ class TcpPacingTestSuite : public TestSuite delAckMaxCount, tid, description), - TestCase::QUICK); + TestCase::Duration::QUICK); description = std::string("Pacing case 6: Slow start, followed by transition to Congestion " "avoidance, no initial pacing, delayed ACKs"); @@ -479,7 +479,7 @@ class TcpPacingTestSuite : public TestSuite delAckMaxCount, tid, description), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-pkts-acked-test.cc b/src/internet/test/tcp-pkts-acked-test.cc index e5f99ec89..e42fec3a6 100644 --- a/src/internet/test/tcp-pkts-acked-test.cc +++ b/src/internet/test/tcp-pkts-acked-test.cc @@ -181,7 +181,7 @@ class TcpPktsAckedTestSuite : public TestSuite : TestSuite("tcp-pkts-acked-test", UNIT) { AddTestCase(new TcpPktsAckedOpenTest("PktsAcked check while in OPEN state"), - TestCase::QUICK); + TestCase::Duration::QUICK); // Add DISORDER, RECOVERY and LOSS state check } }; diff --git a/src/internet/test/tcp-prr-recovery-test.cc b/src/internet/test/tcp-prr-recovery-test.cc index e7f1b7106..40fe2f9cd 100644 --- a/src/internet/test/tcp-prr-recovery-test.cc +++ b/src/internet/test/tcp-prr-recovery-test.cc @@ -164,7 +164,7 @@ class PrrRecoveryTestSuite : public TestSuite 1000, "SSRB", "Prr test on cWnd when bytesInFlight is greater than ssThresh with SSRB"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new PrrRecoveryTest( 1000, 500, @@ -175,7 +175,7 @@ class PrrRecoveryTestSuite : public TestSuite 1000, "SSRB", "Prr test on cWnd when bytesInFlight is lower than ssThresh with SSRB"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new PrrRecoveryTest( 3000, 500, @@ -186,7 +186,7 @@ class PrrRecoveryTestSuite : public TestSuite 1000, "CRB", "Prr test on cWnd when bytesInFlight is greater than ssThresh with CRB"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new PrrRecoveryTest( 1000, 500, @@ -197,7 +197,7 @@ class PrrRecoveryTestSuite : public TestSuite 1000, "CRB", "Prr test on cWnd when bytesInFlight is lower than ssThresh with CRB"), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-rate-ops-test.cc b/src/internet/test/tcp-rate-ops-test.cc index d645b4bc7..bfe503642 100644 --- a/src/internet/test/tcp-rate-ops-test.cc +++ b/src/internet/test/tcp-rate-ops-test.cc @@ -608,14 +608,14 @@ class TcpRateOpsTestSuite : public TestSuite SequenceNumber32(11), 1, "Testing SkbDelivered and SkbSent"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpRateLinuxBasicTest(1000, SequenceNumber32(11), SequenceNumber32(11), 2, "Testing SkbDelivered and SkbSent with app limited data"), - TestCase::QUICK); + TestCase::Duration::QUICK); std::vector toDrop; toDrop.push_back(4001); @@ -623,35 +623,35 @@ class TcpRateOpsTestSuite : public TestSuite new TcpRateLinuxWithSocketsTest("Checking Rate sample value without SACK, one drop", false, toDrop), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpRateLinuxWithSocketsTest("Checking Rate sample value with SACK, one drop", true, toDrop), - TestCase::QUICK); + TestCase::Duration::QUICK); toDrop.push_back(4001); AddTestCase( new TcpRateLinuxWithSocketsTest("Checking Rate sample value without SACK, two drop", false, toDrop), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpRateLinuxWithSocketsTest("Checking Rate sample value with SACK, two drop", true, toDrop), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpRateLinuxWithBufferTest(1000, "Checking rate sample values with arbitrary SACK Block"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpRateLinuxWithBufferTest(500, "Checking rate sample values with arbitrary SACK Block"), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-rto-test.cc b/src/internet/test/tcp-rto-test.cc index 07e15eb46..1f9347793 100644 --- a/src/internet/test/tcp-rto-test.cc +++ b/src/internet/test/tcp-rto-test.cc @@ -523,7 +523,7 @@ class TcpRtoTestSuite : public TestSuite for (const auto& t : types) { AddTestCase(new TcpRtoTest(t, t.GetName() + " RTO retransmit testing"), - TestCase::QUICK); + TestCase::Duration::QUICK); constexpr uint32_t seqToDrop = 25001; @@ -532,7 +532,7 @@ class TcpRtoTestSuite : public TestSuite seqToDrop, Seconds(0.5), t.GetName() + " RTO ssthresh testing, set to 2*MSL"), - TestCase::QUICK); + TestCase::Duration::QUICK); // With RTO of 0.005 seconds, FlightSize/2 > 2*SMSS AddTestCase(new TcpSsThreshRtoTest( @@ -540,10 +540,10 @@ class TcpRtoTestSuite : public TestSuite seqToDrop, Seconds(0.005), t.GetName() + " RTO ssthresh testing, set to half of BytesInFlight"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpTimeRtoTest(t, t.GetName() + " RTO timing testing"), - TestCase::QUICK); + TestCase::Duration::QUICK); } } }; diff --git a/src/internet/test/tcp-rtt-estimation.cc b/src/internet/test/tcp-rtt-estimation.cc index 1e5e46164..7f4e5e064 100644 --- a/src/internet/test/tcp-rtt-estimation.cc +++ b/src/internet/test/tcp-rtt-estimation.cc @@ -252,13 +252,13 @@ class TcpRttEstimationTestSuite : public TestSuite : TestSuite("tcp-rtt-estimation-test", UNIT) { AddTestCase(new TcpRttEstimationTest("RTT estimation, ts, no data", true, 0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpRttEstimationTest("RTT estimation, no ts, no data", false, 0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpRttEstimationTest("RTT estimation, ts, some data", true, 10), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpRttEstimationTest("RTT estimation, no ts, some data", false, 10), - TestCase::QUICK); + TestCase::Duration::QUICK); std::vector toDrop; toDrop.push_back(501); @@ -268,13 +268,13 @@ class TcpRttEstimationTestSuite : public TestSuite false, 10, toDrop), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpRttEstimationWithLossTest("RTT estimation, ts," " some data, with retr", true, 10, toDrop), - TestCase::QUICK); + TestCase::Duration::QUICK); toDrop.push_back(501); AddTestCase(new TcpRttEstimationWithLossTest("RTT estimation, no ts," @@ -282,13 +282,13 @@ class TcpRttEstimationTestSuite : public TestSuite false, 10, toDrop), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpRttEstimationWithLossTest("RTT estimation, ts," " some data, with retr", true, 10, toDrop), - TestCase::QUICK); + TestCase::Duration::QUICK); toDrop.push_back(54001); toDrop.push_back(58001); @@ -300,13 +300,13 @@ class TcpRttEstimationTestSuite : public TestSuite false, 1000, toDrop), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpRttEstimationWithLossTest("RTT estimation, ts," " a lot of data, with retr", true, 1000, toDrop), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-rx-buffer-test.cc b/src/internet/test/tcp-rx-buffer-test.cc index bfc683283..efc84e658 100644 --- a/src/internet/test/tcp-rx-buffer-test.cc +++ b/src/internet/test/tcp-rx-buffer-test.cc @@ -304,7 +304,7 @@ class TcpRxBufferTestSuite : public TestSuite TcpRxBufferTestSuite() : TestSuite("tcp-rx-buffer", UNIT) { - AddTestCase(new TcpRxBufferTestCase, TestCase::QUICK); + 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 cf9bcef99..10d40f936 100644 --- a/src/internet/test/tcp-sack-permitted-test.cc +++ b/src/internet/test/tcp-sack-permitted-test.cc @@ -215,12 +215,14 @@ class TcpSackPermittedTestSuite : public TestSuite TcpSackPermittedTestSuite() : TestSuite("tcp-sack-permitted", UNIT) { - AddTestCase(new SackPermittedTestCase(SackPermittedTestCase::DISABLED), TestCase::QUICK); + AddTestCase(new SackPermittedTestCase(SackPermittedTestCase::DISABLED), + TestCase::Duration::QUICK); AddTestCase(new SackPermittedTestCase(SackPermittedTestCase::ENABLED_RECEIVER), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SackPermittedTestCase(SackPermittedTestCase::ENABLED_SENDER), - TestCase::QUICK); - AddTestCase(new SackPermittedTestCase(SackPermittedTestCase::ENABLED), TestCase::QUICK); + TestCase::Duration::QUICK); + AddTestCase(new SackPermittedTestCase(SackPermittedTestCase::ENABLED), + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-scalable-test.cc b/src/internet/test/tcp-scalable-test.cc index b79e6704c..6c44f730c 100644 --- a/src/internet/test/tcp-scalable-test.cc +++ b/src/internet/test/tcp-scalable-test.cc @@ -178,38 +178,38 @@ class TcpScalableTestSuite : public TestSuite 536, 38, "Scalable increment test on cWnd = 38 segments and segmentSize = 536 bytes"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpScalableIncrementTest( 38, 1, 100, "Scalable increment test on cWnd = 38 segments and segmentSize = 1 byte"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpScalableIncrementTest( 53 * 1446, 1446, 50, "Scalable increment test on cWnd = 53 segments and segmentSize = 1446 bytes"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpScalableDecrementTest( 38, 1, "Scalable decrement test on cWnd = 38 segments and segmentSize = 1 byte"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpScalableDecrementTest( 100 * 536, 536, "Scalable decrement test on cWnd = 100 segments and segmentSize = 536 bytes"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpScalableDecrementTest( 40 * 1446, 1446, "Scalable decrement test on cWnd = 40 segments and segmentSize = 1446 bytes"), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-slow-start-test.cc b/src/internet/test/tcp-slow-start-test.cc index 6b326bfd3..036c991f4 100644 --- a/src/internet/test/tcp-slow-start-test.cc +++ b/src/internet/test/tcp-slow-start-test.cc @@ -284,21 +284,21 @@ class TcpSlowStartTestSuite : public TestSuite 10, t, "slow start 500 byte, " + typeName), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpSlowStartNormalTest(1000, 1000, 10000, 9, t, "slow start 1000 byte, " + typeName), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpSlowStartNormalTest(500, 250, 10000, 10, t, "slow start small packets, " + typeName), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpSlowStartAttackerTest(500, 500, @@ -306,7 +306,7 @@ class TcpSlowStartTestSuite : public TestSuite 10, t, "slow start ack attacker, 500 byte, " + typeName), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpSlowStartAttackerTest(1000, 1000, @@ -314,7 +314,7 @@ class TcpSlowStartTestSuite : public TestSuite 9, t, "slow start ack attacker, 1000 byte, " + typeName), - TestCase::QUICK); + TestCase::Duration::QUICK); } } }; diff --git a/src/internet/test/tcp-syn-connection-failed-test.cc b/src/internet/test/tcp-syn-connection-failed-test.cc index bb418ebb9..53bc8b946 100644 --- a/src/internet/test/tcp-syn-connection-failed-test.cc +++ b/src/internet/test/tcp-syn-connection-failed-test.cc @@ -105,9 +105,9 @@ class TcpSynConnectionFailedTestSuite : public TestSuite : TestSuite("tcp-syn-connection-failed-test", UNIT) { AddTestCase(new TcpSynConnectionFailedTest("TCP SYN connection failed test no ECN", false), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpSynConnectionFailedTest("TCP SYN connection failed test with ECN", true), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-test.cc b/src/internet/test/tcp-test.cc index 3024e4bcf..37952edbc 100644 --- a/src/internet/test/tcp-test.cc +++ b/src/internet/test/tcp-test.cc @@ -549,13 +549,13 @@ class TcpTestSuite : public TestSuite // 2) source write size, 3) source read size // 4) server write size, and 5) server read size // with units of bytes - AddTestCase(new TcpTestCase(13, 200, 200, 200, 200, false), TestCase::QUICK); - AddTestCase(new TcpTestCase(13, 1, 1, 1, 1, false), TestCase::QUICK); - AddTestCase(new TcpTestCase(100000, 100, 50, 100, 20, false), TestCase::QUICK); + AddTestCase(new TcpTestCase(13, 200, 200, 200, 200, false), TestCase::Duration::QUICK); + AddTestCase(new TcpTestCase(13, 1, 1, 1, 1, false), TestCase::Duration::QUICK); + AddTestCase(new TcpTestCase(100000, 100, 50, 100, 20, false), TestCase::Duration::QUICK); - AddTestCase(new TcpTestCase(13, 200, 200, 200, 200, true), TestCase::QUICK); - AddTestCase(new TcpTestCase(13, 1, 1, 1, 1, true), TestCase::QUICK); - AddTestCase(new TcpTestCase(100000, 100, 50, 100, 20, true), TestCase::QUICK); + AddTestCase(new TcpTestCase(13, 200, 200, 200, 200, true), TestCase::Duration::QUICK); + AddTestCase(new TcpTestCase(13, 1, 1, 1, 1, true), TestCase::Duration::QUICK); + AddTestCase(new TcpTestCase(100000, 100, 50, 100, 20, true), TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-timestamp-test.cc b/src/internet/test/tcp-timestamp-test.cc index 409df36fa..ff76844df 100644 --- a/src/internet/test/tcp-timestamp-test.cc +++ b/src/internet/test/tcp-timestamp-test.cc @@ -298,15 +298,18 @@ class TcpTimestampTestSuite : public TestSuite TcpTimestampTestSuite() : TestSuite("tcp-timestamp", UNIT) { - AddTestCase(new TimestampTestCase(TimestampTestCase::DISABLED), TestCase::QUICK); - AddTestCase(new TimestampTestCase(TimestampTestCase::ENABLED_RECEIVER), TestCase::QUICK); - AddTestCase(new TimestampTestCase(TimestampTestCase::ENABLED_SENDER), TestCase::QUICK); - AddTestCase(new TimestampTestCase(TimestampTestCase::ENABLED), TestCase::QUICK); - AddTestCase(new TimestampValueTestCase(0.0, 0.01, "Value Check"), TestCase::QUICK); - AddTestCase(new TimestampValueTestCase(3.0, 0.5, "Value Check"), TestCase::QUICK); - AddTestCase(new TimestampValueTestCase(5.5, 1.0, "Value Check"), TestCase::QUICK); - AddTestCase(new TimestampValueTestCase(6.0, 2.0, "Value Check"), TestCase::QUICK); - AddTestCase(new TimestampValueTestCase(2.4, 0.7, "Value Check"), TestCase::QUICK); + AddTestCase(new TimestampTestCase(TimestampTestCase::DISABLED), TestCase::Duration::QUICK); + AddTestCase(new TimestampTestCase(TimestampTestCase::ENABLED_RECEIVER), + TestCase::Duration::QUICK); + AddTestCase(new TimestampTestCase(TimestampTestCase::ENABLED_SENDER), + TestCase::Duration::QUICK); + AddTestCase(new TimestampTestCase(TimestampTestCase::ENABLED), TestCase::Duration::QUICK); + AddTestCase(new TimestampValueTestCase(0.0, 0.01, "Value Check"), + TestCase::Duration::QUICK); + AddTestCase(new TimestampValueTestCase(3.0, 0.5, "Value Check"), TestCase::Duration::QUICK); + AddTestCase(new TimestampValueTestCase(5.5, 1.0, "Value Check"), TestCase::Duration::QUICK); + AddTestCase(new TimestampValueTestCase(6.0, 2.0, "Value Check"), TestCase::Duration::QUICK); + AddTestCase(new TimestampValueTestCase(2.4, 0.7, "Value Check"), TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-tx-buffer-test.cc b/src/internet/test/tcp-tx-buffer-test.cc index 275276e53..4bf365c3b 100644 --- a/src/internet/test/tcp-tx-buffer-test.cc +++ b/src/internet/test/tcp-tx-buffer-test.cc @@ -441,7 +441,7 @@ class TcpTxBufferTestSuite : public TestSuite TcpTxBufferTestSuite() : TestSuite("tcp-tx-buffer", UNIT) { - AddTestCase(new TcpTxBufferTestCase, TestCase::QUICK); + 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 00ec3e4b1..513e0d1de 100644 --- a/src/internet/test/tcp-vegas-test.cc +++ b/src/internet/test/tcp-vegas-test.cc @@ -220,7 +220,7 @@ class TcpVegasTestSuite : public TestSuite SequenceNumber32(2893), SequenceNumber32(5785), "Vegas test on cWnd and ssThresh when in slow start and diff > gamma"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TcpVegasTest(5 * 536, 536, @@ -230,7 +230,7 @@ class TcpVegasTestSuite : public TestSuite SequenceNumber32(3216), SequenceNumber32(3753), "Vegas test on cWnd and ssThresh when in slow start and diff < gamma"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpVegasTest(60 * 346, 346, 40 * 346, @@ -239,7 +239,7 @@ class TcpVegasTestSuite : public TestSuite SequenceNumber32(20761), SequenceNumber32(21107), "Vegas test on cWnd and ssThresh when diff > beta"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpVegasTest(15 * 1446, 1446, 10 * 1446, @@ -248,7 +248,7 @@ class TcpVegasTestSuite : public TestSuite SequenceNumber32(21691), SequenceNumber32(24583), "Vegas test on cWnd and ssThresh when diff < alpha"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpVegasTest(20 * 746, 746, 10 * 746, @@ -257,7 +257,7 @@ class TcpVegasTestSuite : public TestSuite SequenceNumber32(14921), SequenceNumber32(15667), "Vegas test on cWnd and ssThresh when alpha <= diff <= beta"), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-veno-test.cc b/src/internet/test/tcp-veno-test.cc index c2c23cc60..69bb23dcc 100644 --- a/src/internet/test/tcp-veno-test.cc +++ b/src/internet/test/tcp-veno-test.cc @@ -315,7 +315,7 @@ class TcpVenoTestSuite : public TestSuite 1, 1, "Veno test on cWnd in slow start and non-congestive loss"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpVenoTest(30 * 536, 536, 20 * 536, @@ -323,7 +323,7 @@ class TcpVenoTestSuite : public TestSuite 1, 1, "Veno test on cWnd with diff < beta"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpVenoTest(60 * 536, 536, 40 * 536, @@ -331,7 +331,7 @@ class TcpVenoTestSuite : public TestSuite 1, 3, "Veno increment test on cWnd with diff > beta"), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-wscaling-test.cc b/src/internet/test/tcp-wscaling-test.cc index 5a2ed814f..035a227ef 100644 --- a/src/internet/test/tcp-wscaling-test.cc +++ b/src/internet/test/tcp-wscaling-test.cc @@ -236,42 +236,42 @@ class TcpWScalingTestSuite : public TestSuite { AddTestCase( new WScalingTestCase(WScalingTestCase::ENABLED, 200000, 65535, "WS only server"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new WScalingTestCase(WScalingTestCase::ENABLED, 65535, 65535, "Window scaling not used, all enabled"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new WScalingTestCase(WScalingTestCase::DISABLED, 65535, 65535, "WS disabled"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new WScalingTestCase(WScalingTestCase::ENABLED_SENDER, 65535, 65535, "WS enabled client"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new WScalingTestCase(WScalingTestCase::ENABLED_RECEIVER, 65535, 65535, "WS disabled client"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new WScalingTestCase(WScalingTestCase::ENABLED, 65535, 200000, "WS only client"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new WScalingTestCase(WScalingTestCase::ENABLED, 131072, 65535, "WS only server"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new WScalingTestCase(WScalingTestCase::ENABLED, 65535, 131072, "WS only client"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new WScalingTestCase(WScalingTestCase::ENABLED, 4000, 4000, "WS small window, all"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new WScalingTestCase(WScalingTestCase::ENABLED_SENDER, 4000, 4000, "WS small window, sender"), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-yeah-test.cc b/src/internet/test/tcp-yeah-test.cc index 3694fde42..db8faf1db 100644 --- a/src/internet/test/tcp-yeah-test.cc +++ b/src/internet/test/tcp-yeah-test.cc @@ -374,7 +374,7 @@ class TcpYeahTestSuite : public TestSuite 1, MilliSeconds(105), "YeAH test on cWnd when in slow start"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpYeahIncrementTest(30 * 1446, 25 * 1446, 1446, @@ -383,7 +383,7 @@ class TcpYeahTestSuite : public TestSuite 30, MilliSeconds(105), "YeAH test on cWnd when in Fast mode"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpYeahIncrementTest( 40 * 356, 30 * 356, @@ -393,7 +393,7 @@ class TcpYeahTestSuite : public TestSuite 1, MilliSeconds(120), "YeAH test on cWnd when in slow mode without precautionary decongestion"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpYeahIncrementTest( 100 * 356, 70 * 356, @@ -403,7 +403,7 @@ class TcpYeahTestSuite : public TestSuite 1, MilliSeconds(600), "YeAH test on cWnd when in slow mode with precautionary decongestion"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpYeahDecrementTest( 40 * 1446, 30 * 1446, @@ -413,7 +413,7 @@ class TcpYeahTestSuite : public TestSuite MilliSeconds(120), UintegerValue(0), "YeAH test on ssThresh upon loss while competing with Reno flows"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TcpYeahDecrementTest( 57 * 1446, 42 * 1446, @@ -423,7 +423,7 @@ class TcpYeahTestSuite : public TestSuite MilliSeconds(200), UintegerValue(2), "YeAH test on ssThresh upon loss while not competing with Reno flows"), - TestCase::QUICK); + TestCase::Duration::QUICK); } }; diff --git a/src/internet/test/tcp-zero-window-test.cc b/src/internet/test/tcp-zero-window-test.cc index d7e0ce5bc..f3ea371fd 100644 --- a/src/internet/test/tcp-zero-window-test.cc +++ b/src/internet/test/tcp-zero-window-test.cc @@ -257,7 +257,7 @@ class TcpZeroWindowTestSuite : public TestSuite TcpZeroWindowTestSuite() : TestSuite("tcp-zero-window-test", UNIT) { - AddTestCase(new TcpZeroWindowTest("zero window test"), TestCase::QUICK); + 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 be5f6fce2..91080a624 100644 --- a/src/internet/test/udp-test.cc +++ b/src/internet/test/udp-test.cc @@ -771,10 +771,10 @@ class UdpTestSuite : public TestSuite UdpTestSuite() : TestSuite("udp", UNIT) { - AddTestCase(new UdpSocketImplTest, TestCase::QUICK); - AddTestCase(new UdpSocketLoopbackTest, TestCase::QUICK); - AddTestCase(new Udp6SocketImplTest, TestCase::QUICK); - AddTestCase(new Udp6SocketLoopbackTest, TestCase::QUICK); + AddTestCase(new UdpSocketImplTest, TestCase::Duration::QUICK); + AddTestCase(new UdpSocketLoopbackTest, TestCase::Duration::QUICK); + AddTestCase(new Udp6SocketImplTest, TestCase::Duration::QUICK); + AddTestCase(new Udp6SocketLoopbackTest, 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 ee8a494ec..4a700ab4b 100644 --- a/src/lr-wpan/test/lr-wpan-ack-test.cc +++ b/src/lr-wpan/test/lr-wpan-ack-test.cc @@ -339,16 +339,16 @@ LrWpanAckTestSuite::LrWpanAckTestSuite() : TestSuite("lr-wpan-ack", UNIT) { AddTestCase(new LrWpanAckTestCase("short-unicast", LrWpanAckTestCase::SHORT_ADDRESS_UNICAST), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new LrWpanAckTestCase("short-multicast", LrWpanAckTestCase::SHORT_ADDRESS_MULTICAST), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new LrWpanAckTestCase("short-broadcast", LrWpanAckTestCase::SHORT_ADDRESS_BROADCAST), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new LrWpanAckTestCase("extended-unicast", LrWpanAckTestCase::EXTENDED_ADDRESS_UNICAST), - TestCase::QUICK); + TestCase::Duration::QUICK); } static LrWpanAckTestSuite g_lrWpanAckTestSuite; //!< Static variable for test initialization diff --git a/src/lr-wpan/test/lr-wpan-cca-test.cc b/src/lr-wpan/test/lr-wpan-cca-test.cc index 48506eeaa..eca644db9 100644 --- a/src/lr-wpan/test/lr-wpan-cca-test.cc +++ b/src/lr-wpan/test/lr-wpan-cca-test.cc @@ -366,7 +366,7 @@ class LrWpanCcaTestSuite : public TestSuite LrWpanCcaTestSuite::LrWpanCcaTestSuite() : TestSuite("lr-wpan-clear-channel-assessment", UNIT) { - AddTestCase(new LrWpanCcaTestCase, TestCase::QUICK); + AddTestCase(new LrWpanCcaTestCase, TestCase::Duration::QUICK); } static LrWpanCcaTestSuite g_lrWpanCcaTestSuite; //!< Static variable for test initialization diff --git a/src/lr-wpan/test/lr-wpan-collision-test.cc b/src/lr-wpan/test/lr-wpan-collision-test.cc index 91f294c85..cf03063d3 100644 --- a/src/lr-wpan/test/lr-wpan-collision-test.cc +++ b/src/lr-wpan/test/lr-wpan-collision-test.cc @@ -227,7 +227,7 @@ class LrWpanCollisionTestSuite : public TestSuite LrWpanCollisionTestSuite::LrWpanCollisionTestSuite() : TestSuite("lr-wpan-collision", UNIT) { - AddTestCase(new LrWpanCollisionTestCase, TestCase::QUICK); + AddTestCase(new LrWpanCollisionTestCase, TestCase::Duration::QUICK); } static LrWpanCollisionTestSuite diff --git a/src/lr-wpan/test/lr-wpan-ed-test.cc b/src/lr-wpan/test/lr-wpan-ed-test.cc index 37539caad..9373686ac 100644 --- a/src/lr-wpan/test/lr-wpan-ed-test.cc +++ b/src/lr-wpan/test/lr-wpan-ed-test.cc @@ -268,7 +268,7 @@ class LrWpanEdTestSuite : public TestSuite LrWpanEdTestSuite::LrWpanEdTestSuite() : TestSuite("lr-wpan-energy-detection", UNIT) { - AddTestCase(new LrWpanEdTestCase, TestCase::QUICK); + AddTestCase(new LrWpanEdTestCase, TestCase::Duration::QUICK); } static LrWpanEdTestSuite g_lrWpanEdTestSuite; //!< Static variable for test initialization 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 19b67599f..75c04a0cd 100644 --- a/src/lr-wpan/test/lr-wpan-error-model-test.cc +++ b/src/lr-wpan/test/lr-wpan-error-model-test.cc @@ -209,8 +209,8 @@ class LrWpanErrorModelTestSuite : public TestSuite LrWpanErrorModelTestSuite::LrWpanErrorModelTestSuite() : TestSuite("lr-wpan-error-model", UNIT) { - AddTestCase(new LrWpanErrorModelTestCase, TestCase::QUICK); - AddTestCase(new LrWpanErrorDistanceTestCase, TestCase::QUICK); + AddTestCase(new LrWpanErrorModelTestCase, TestCase::Duration::QUICK); + AddTestCase(new LrWpanErrorDistanceTestCase, TestCase::Duration::QUICK); } static LrWpanErrorModelTestSuite diff --git a/src/lr-wpan/test/lr-wpan-ifs-test.cc b/src/lr-wpan/test/lr-wpan-ifs-test.cc index dccdcd126..ee9bbfd49 100644 --- a/src/lr-wpan/test/lr-wpan-ifs-test.cc +++ b/src/lr-wpan/test/lr-wpan-ifs-test.cc @@ -420,7 +420,7 @@ class LrWpanIfsTestSuite : public TestSuite LrWpanIfsTestSuite::LrWpanIfsTestSuite() : TestSuite("lr-wpan-ifs-test", UNIT) { - AddTestCase(new LrWpanDataIfsTestCase, TestCase::QUICK); + AddTestCase(new LrWpanDataIfsTestCase, TestCase::Duration::QUICK); } static LrWpanIfsTestSuite lrWpanIfsTestSuite; //!< Static variable for test initialization diff --git a/src/lr-wpan/test/lr-wpan-mac-test.cc b/src/lr-wpan/test/lr-wpan-mac-test.cc index 6cde6c01a..c973bece0 100644 --- a/src/lr-wpan/test/lr-wpan-mac-test.cc +++ b/src/lr-wpan/test/lr-wpan-mac-test.cc @@ -725,9 +725,9 @@ class LrWpanMacTestSuite : public TestSuite LrWpanMacTestSuite::LrWpanMacTestSuite() : TestSuite("lr-wpan-mac-test", UNIT) { - AddTestCase(new TestRxOffWhenIdleAfterCsmaFailure, TestCase::QUICK); - AddTestCase(new TestActiveScanPanDescriptors, TestCase::QUICK); - AddTestCase(new TestOrphanScan, TestCase::QUICK); + AddTestCase(new TestRxOffWhenIdleAfterCsmaFailure, TestCase::Duration::QUICK); + AddTestCase(new TestActiveScanPanDescriptors, TestCase::Duration::QUICK); + AddTestCase(new TestOrphanScan, TestCase::Duration::QUICK); } static LrWpanMacTestSuite g_lrWpanMacTestSuite; //!< Static variable for test initialization diff --git a/src/lr-wpan/test/lr-wpan-packet-test.cc b/src/lr-wpan/test/lr-wpan-packet-test.cc index 7394a103a..5f0f62975 100644 --- a/src/lr-wpan/test/lr-wpan-packet-test.cc +++ b/src/lr-wpan/test/lr-wpan-packet-test.cc @@ -122,7 +122,7 @@ class LrWpanPacketTestSuite : public TestSuite LrWpanPacketTestSuite::LrWpanPacketTestSuite() : TestSuite("lr-wpan-packet", UNIT) { - AddTestCase(new LrWpanPacketTestCase, TestCase::QUICK); + AddTestCase(new LrWpanPacketTestCase, TestCase::Duration::QUICK); } static LrWpanPacketTestSuite g_lrWpanPacketTestSuite; //!< Static variable for test initialization 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 c7fdaa4c0..d28fc93a6 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 @@ -106,7 +106,7 @@ class LrWpanPlmeAndPdInterfaceTestSuite : public TestSuite LrWpanPlmeAndPdInterfaceTestSuite::LrWpanPlmeAndPdInterfaceTestSuite() : TestSuite("lr-wpan-plme-pd-sap", UNIT) { - AddTestCase(new LrWpanPlmeAndPdInterfaceTestCase, TestCase::QUICK); + AddTestCase(new LrWpanPlmeAndPdInterfaceTestCase, TestCase::Duration::QUICK); } // Do not forget to allocate an instance of this TestSuite 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 ba53af5c1..aed5d1ecc 100644 --- a/src/lr-wpan/test/lr-wpan-slotted-csmaca-test.cc +++ b/src/lr-wpan/test/lr-wpan-slotted-csmaca-test.cc @@ -353,7 +353,7 @@ class LrWpanSlottedCsmacaTestSuite : public TestSuite LrWpanSlottedCsmacaTestSuite::LrWpanSlottedCsmacaTestSuite() : TestSuite("lr-wpan-slotted-csmaca", UNIT) { - AddTestCase(new LrWpanSlottedCsmacaTestCase, TestCase::QUICK); + AddTestCase(new LrWpanSlottedCsmacaTestCase, TestCase::Duration::QUICK); } static LrWpanSlottedCsmacaTestSuite 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 83b6015d8..82764a7d2 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 @@ -87,7 +87,7 @@ class LrWpanSpectrumValueHelperTestSuite : public TestSuite LrWpanSpectrumValueHelperTestSuite::LrWpanSpectrumValueHelperTestSuite() : TestSuite("lr-wpan-spectrum-value-helper", UNIT) { - AddTestCase(new LrWpanSpectrumValueHelperTestCase, TestCase::QUICK); + AddTestCase(new LrWpanSpectrumValueHelperTestCase, TestCase::Duration::QUICK); } static LrWpanSpectrumValueHelperTestSuite diff --git a/src/lte/test/epc-test-gtpu.cc b/src/lte/test/epc-test-gtpu.cc index 8649892ce..c89dd4c83 100644 --- a/src/lte/test/epc-test-gtpu.cc +++ b/src/lte/test/epc-test-gtpu.cc @@ -35,7 +35,7 @@ NS_LOG_COMPONENT_DEFINE("EpcGtpuTest"); EpsGtpuTestSuite::EpsGtpuTestSuite() : TestSuite("epc-gtpu", SYSTEM) { - AddTestCase(new EpsGtpuHeaderTestCase(), TestCase::QUICK); + AddTestCase(new EpsGtpuHeaderTestCase(), TestCase::Duration::QUICK); } static EpsGtpuTestSuite epsGtpuTestSuite; diff --git a/src/lte/test/epc-test-s1u-downlink.cc b/src/lte/test/epc-test-s1u-downlink.cc index f18163f0e..6680bff16 100644 --- a/src/lte/test/epc-test-s1u-downlink.cc +++ b/src/lte/test/epc-test-s1u-downlink.cc @@ -274,7 +274,7 @@ EpcS1uDlTestSuite::EpcS1uDlTestSuite() UeDlTestData f1(1, 100); e1.ues.push_back(f1); v1.push_back(e1); - AddTestCase(new EpcS1uDlTestCase("1 eNB, 1UE", v1), TestCase::QUICK); + AddTestCase(new EpcS1uDlTestCase("1 eNB, 1UE", v1), TestCase::Duration::QUICK); std::vector v2; EnbDlTestData e2; @@ -283,12 +283,12 @@ EpcS1uDlTestSuite::EpcS1uDlTestSuite() UeDlTestData f2_2(2, 200); e2.ues.push_back(f2_2); v2.push_back(e2); - AddTestCase(new EpcS1uDlTestCase("1 eNB, 2UEs", v2), TestCase::QUICK); + AddTestCase(new EpcS1uDlTestCase("1 eNB, 2UEs", v2), TestCase::Duration::QUICK); std::vector v3; v3.push_back(e1); v3.push_back(e2); - AddTestCase(new EpcS1uDlTestCase("2 eNBs", v3), TestCase::QUICK); + AddTestCase(new EpcS1uDlTestCase("2 eNBs", v3), TestCase::Duration::QUICK); EnbDlTestData e3; UeDlTestData f3_1(3, 50); @@ -301,33 +301,37 @@ EpcS1uDlTestSuite::EpcS1uDlTestSuite() v4.push_back(e3); v4.push_back(e1); v4.push_back(e2); - AddTestCase(new EpcS1uDlTestCase("3 eNBs", v4), TestCase::QUICK); + AddTestCase(new EpcS1uDlTestCase("3 eNBs", v4), TestCase::Duration::QUICK); std::vector v5; EnbDlTestData e5; UeDlTestData f5(10, 3000); e5.ues.push_back(f5); v5.push_back(e5); - AddTestCase(new EpcS1uDlTestCase("1 eNB, 10 pkts 3000 bytes each", v5), TestCase::QUICK); + AddTestCase(new EpcS1uDlTestCase("1 eNB, 10 pkts 3000 bytes each", v5), + TestCase::Duration::QUICK); std::vector v6; EnbDlTestData e6; UeDlTestData f6(50, 3000); e6.ues.push_back(f6); v6.push_back(e6); - AddTestCase(new EpcS1uDlTestCase("1 eNB, 50 pkts 3000 bytes each", v6), TestCase::QUICK); + AddTestCase(new EpcS1uDlTestCase("1 eNB, 50 pkts 3000 bytes each", v6), + TestCase::Duration::QUICK); std::vector v7; EnbDlTestData e7; UeDlTestData f7(10, 15000); e7.ues.push_back(f7); v7.push_back(e7); - AddTestCase(new EpcS1uDlTestCase("1 eNB, 10 pkts 15000 bytes each", v7), TestCase::QUICK); + AddTestCase(new EpcS1uDlTestCase("1 eNB, 10 pkts 15000 bytes each", v7), + TestCase::Duration::QUICK); std::vector v8; EnbDlTestData e8; UeDlTestData f8(100, 15000); e8.ues.push_back(f8); v8.push_back(e8); - AddTestCase(new EpcS1uDlTestCase("1 eNB, 100 pkts 15000 bytes each", v8), TestCase::QUICK); + AddTestCase(new EpcS1uDlTestCase("1 eNB, 100 pkts 15000 bytes each", v8), + TestCase::Duration::QUICK); } diff --git a/src/lte/test/epc-test-s1u-uplink.cc b/src/lte/test/epc-test-s1u-uplink.cc index bdf0acd6a..478284417 100644 --- a/src/lte/test/epc-test-s1u-uplink.cc +++ b/src/lte/test/epc-test-s1u-uplink.cc @@ -515,7 +515,7 @@ EpcS1uUlTestSuite::EpcS1uUlTestSuite() UeUlTestData f1(1, 100, 1, 1); e1.ues.push_back(f1); v1.push_back(e1); - AddTestCase(new EpcS1uUlTestCase("1 eNB, 1UE", v1), TestCase::QUICK); + AddTestCase(new EpcS1uUlTestCase("1 eNB, 1UE", v1), TestCase::Duration::QUICK); std::vector v2; EnbUlTestData e2; @@ -524,12 +524,12 @@ EpcS1uUlTestSuite::EpcS1uUlTestSuite() UeUlTestData f2_2(2, 200, 2, 1); e2.ues.push_back(f2_2); v2.push_back(e2); - AddTestCase(new EpcS1uUlTestCase("1 eNB, 2UEs", v2), TestCase::QUICK); + AddTestCase(new EpcS1uUlTestCase("1 eNB, 2UEs", v2), TestCase::Duration::QUICK); std::vector v3; v3.push_back(e1); v3.push_back(e2); - AddTestCase(new EpcS1uUlTestCase("2 eNBs", v3), TestCase::QUICK); + AddTestCase(new EpcS1uUlTestCase("2 eNBs", v3), TestCase::Duration::QUICK); EnbUlTestData e3; UeUlTestData f3_1(3, 50, 1, 1); @@ -542,33 +542,37 @@ EpcS1uUlTestSuite::EpcS1uUlTestSuite() v4.push_back(e3); v4.push_back(e1); v4.push_back(e2); - AddTestCase(new EpcS1uUlTestCase("3 eNBs", v4), TestCase::QUICK); + AddTestCase(new EpcS1uUlTestCase("3 eNBs", v4), TestCase::Duration::QUICK); std::vector v5; EnbUlTestData e5; UeUlTestData f5(10, 3000, 1, 1); e5.ues.push_back(f5); v5.push_back(e5); - AddTestCase(new EpcS1uUlTestCase("1 eNB, 10 pkts 3000 bytes each", v5), TestCase::QUICK); + AddTestCase(new EpcS1uUlTestCase("1 eNB, 10 pkts 3000 bytes each", v5), + TestCase::Duration::QUICK); std::vector v6; EnbUlTestData e6; UeUlTestData f6(50, 3000, 1, 1); e6.ues.push_back(f6); v6.push_back(e6); - AddTestCase(new EpcS1uUlTestCase("1 eNB, 50 pkts 3000 bytes each", v6), TestCase::QUICK); + AddTestCase(new EpcS1uUlTestCase("1 eNB, 50 pkts 3000 bytes each", v6), + TestCase::Duration::QUICK); std::vector v7; EnbUlTestData e7; UeUlTestData f7(10, 15000, 1, 1); e7.ues.push_back(f7); v7.push_back(e7); - AddTestCase(new EpcS1uUlTestCase("1 eNB, 10 pkts 15000 bytes each", v7), TestCase::QUICK); + AddTestCase(new EpcS1uUlTestCase("1 eNB, 10 pkts 15000 bytes each", v7), + TestCase::Duration::QUICK); std::vector v8; EnbUlTestData e8; UeUlTestData f8(100, 15000, 1, 1); e8.ues.push_back(f8); v8.push_back(e8); - AddTestCase(new EpcS1uUlTestCase("1 eNB, 100 pkts 15000 bytes each", v8), TestCase::QUICK); + AddTestCase(new EpcS1uUlTestCase("1 eNB, 100 pkts 15000 bytes each", v8), + TestCase::Duration::QUICK); } diff --git a/src/lte/test/lte-test-aggregation-throughput-scale.cc b/src/lte/test/lte-test-aggregation-throughput-scale.cc index 5bcb163a7..06a2d14e7 100644 --- a/src/lte/test/lte-test-aggregation-throughput-scale.cc +++ b/src/lte/test/lte-test-aggregation-throughput-scale.cc @@ -51,7 +51,7 @@ LteAggregationThroughputScaleTestSuite::LteAggregationThroughputScaleTestSuite() : TestSuite("lte-aggregation-throughput-scale", SYSTEM) { AddTestCase(new LteAggregationThroughputScaleTestCase("Carrier aggregation throughput scale"), - TestCase::QUICK); + 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 8431c0b59..361b6b08f 100644 --- a/src/lte/test/lte-test-carrier-aggregation-configuration.cc +++ b/src/lte/test/lte-test-carrier-aggregation-configuration.cc @@ -419,7 +419,7 @@ CarrierAggregationConfigTestSuite::CarrierAggregationConfigTestSuite() numberOfComponentCarriers, configToCheck, simulationDuration), - TestCase::QUICK); + TestCase::Duration::QUICK); // configToCheck.erase(configToCheck.begin(), configToCheck.end()); configToCheck.clear(); @@ -446,7 +446,7 @@ CarrierAggregationConfigTestSuite::CarrierAggregationConfigTestSuite() numberOfComponentCarriers, configToCheck, simulationDuration), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/lte-test-carrier-aggregation.cc b/src/lte/test/lte-test-carrier-aggregation.cc index ebab1ad8a..5d1209c87 100644 --- a/src/lte/test/lte-test-carrier-aggregation.cc +++ b/src/lte/test/lte-test-carrier-aggregation.cc @@ -116,142 +116,214 @@ TestCarrierAggregationSuite::TestCarrierAggregationSuite() return; } - AddTestCase(new CarrierAggregationTestCase(1, 0, 100, 100, 1), TestCase::QUICK); - AddTestCase(new CarrierAggregationTestCase(3, 0, 100, 100, 1), TestCase::QUICK); - AddTestCase(new CarrierAggregationTestCase(6, 0, 100, 100, 1), TestCase::QUICK); - AddTestCase(new CarrierAggregationTestCase(9, 0, 100, 100, 1), TestCase::QUICK); - AddTestCase(new CarrierAggregationTestCase(12, 0, 100, 100, 1), TestCase::QUICK); - AddTestCase(new CarrierAggregationTestCase(15, 0, 100, 100, 1), TestCase::QUICK); + AddTestCase(new CarrierAggregationTestCase(1, 0, 100, 100, 1), TestCase::Duration::QUICK); + AddTestCase(new CarrierAggregationTestCase(3, 0, 100, 100, 1), TestCase::Duration::QUICK); + AddTestCase(new CarrierAggregationTestCase(6, 0, 100, 100, 1), TestCase::Duration::QUICK); + AddTestCase(new CarrierAggregationTestCase(9, 0, 100, 100, 1), TestCase::Duration::QUICK); + AddTestCase(new CarrierAggregationTestCase(12, 0, 100, 100, 1), TestCase::Duration::QUICK); + AddTestCase(new CarrierAggregationTestCase(15, 0, 100, 100, 1), TestCase::Duration::QUICK); - AddTestCase(new CarrierAggregationTestCase(1, 0, 100, 100, 2), TestCase::QUICK); - AddTestCase(new CarrierAggregationTestCase(3, 0, 100, 100, 2), TestCase::QUICK); - AddTestCase(new CarrierAggregationTestCase(6, 0, 100, 100, 2), TestCase::QUICK); - AddTestCase(new CarrierAggregationTestCase(9, 0, 100, 100, 2), TestCase::QUICK); - AddTestCase(new CarrierAggregationTestCase(12, 0, 100, 100, 2), TestCase::QUICK); - AddTestCase(new CarrierAggregationTestCase(15, 0, 100, 100, 2), TestCase::QUICK); + AddTestCase(new CarrierAggregationTestCase(1, 0, 100, 100, 2), TestCase::Duration::QUICK); + AddTestCase(new CarrierAggregationTestCase(3, 0, 100, 100, 2), TestCase::Duration::QUICK); + AddTestCase(new CarrierAggregationTestCase(6, 0, 100, 100, 2), TestCase::Duration::QUICK); + AddTestCase(new CarrierAggregationTestCase(9, 0, 100, 100, 2), TestCase::Duration::QUICK); + AddTestCase(new CarrierAggregationTestCase(12, 0, 100, 100, 2), TestCase::Duration::QUICK); + AddTestCase(new CarrierAggregationTestCase(15, 0, 100, 100, 2), TestCase::Duration::QUICK); - AddTestCase(new CarrierAggregationTestCase(1, 0, 100, 100, 3), TestCase::QUICK); - AddTestCase(new CarrierAggregationTestCase(3, 0, 100, 100, 3), TestCase::QUICK); - AddTestCase(new CarrierAggregationTestCase(6, 0, 100, 100, 3), TestCase::QUICK); - AddTestCase(new CarrierAggregationTestCase(9, 0, 100, 100, 3), TestCase::QUICK); - AddTestCase(new CarrierAggregationTestCase(12, 0, 100, 100, 3), TestCase::QUICK); - AddTestCase(new CarrierAggregationTestCase(15, 0, 100, 100, 3), TestCase::QUICK); + AddTestCase(new CarrierAggregationTestCase(1, 0, 100, 100, 3), TestCase::Duration::QUICK); + AddTestCase(new CarrierAggregationTestCase(3, 0, 100, 100, 3), TestCase::Duration::QUICK); + AddTestCase(new CarrierAggregationTestCase(6, 0, 100, 100, 3), TestCase::Duration::QUICK); + AddTestCase(new CarrierAggregationTestCase(9, 0, 100, 100, 3), TestCase::Duration::QUICK); + AddTestCase(new CarrierAggregationTestCase(12, 0, 100, 100, 3), TestCase::Duration::QUICK); + AddTestCase(new CarrierAggregationTestCase(15, 0, 100, 100, 3), TestCase::Duration::QUICK); } else { // bandwidth is 25 and there are 2 carriers - AddTestCase(new CarrierAggregationTestCase(1, 0, 25, 25, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(3, 0, 25, 25, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(6, 0, 25, 25, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(9, 0, 25, 25, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(12, 0, 25, 25, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(15, 0, 25, 25, 2), TestCase::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(1, 0, 25, 25, 2), TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(3, 0, 25, 25, 2), TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(6, 0, 25, 25, 2), TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(9, 0, 25, 25, 2), TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(12, 0, 25, 25, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(15, 0, 25, 25, 2), + TestCase::Duration::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(1, 4800, 25, 25, 2), TestCase::QUICK); - AddTestCase(new CarrierAggregationTestCase(3, 4800, 25, 25, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(6, 4800, 25, 25, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(9, 4800, 25, 25, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(12, 4800, 25, 25, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(15, 4800, 25, 25, 2), TestCase::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(1, 4800, 25, 25, 2), TestCase::Duration::QUICK); + AddTestCase(new CarrierAggregationTestCase(3, 4800, 25, 25, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(6, 4800, 25, 25, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(9, 4800, 25, 25, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(12, 4800, 25, 25, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(15, 4800, 25, 25, 2), + TestCase::Duration::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(1, 6000, 25, 25, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(3, 6000, 25, 25, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(6, 6000, 25, 25, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(9, 6000, 25, 25, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(12, 6000, 25, 25, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(15, 6000, 25, 25, 2), TestCase::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(1, 6000, 25, 25, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(3, 6000, 25, 25, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(6, 6000, 25, 25, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(9, 6000, 25, 25, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(12, 6000, 25, 25, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(15, 6000, 25, 25, 2), + TestCase::Duration::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(1, 20000, 25, 25, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(3, 20000, 25, 25, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(6, 20000, 25, 25, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(9, 20000, 25, 25, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(12, 20000, 25, 25, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(15, 20000, 25, 25, 2), TestCase::QUICK); + AddTestCase(new CarrierAggregationTestCase(1, 20000, 25, 25, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(3, 20000, 25, 25, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(6, 20000, 25, 25, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(9, 20000, 25, 25, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(12, 20000, 25, 25, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(15, 20000, 25, 25, 2), + TestCase::Duration::QUICK); // bandwidth is 25 and there are 3 carriers - AddTestCase(new CarrierAggregationTestCase(1, 0, 25, 25, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(3, 0, 25, 25, 3), TestCase::QUICK); - AddTestCase(new CarrierAggregationTestCase(6, 0, 25, 25, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(9, 0, 25, 25, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(12, 0, 25, 25, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(15, 0, 25, 25, 3), TestCase::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(1, 0, 25, 25, 3), TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(3, 0, 25, 25, 3), TestCase::Duration::QUICK); + AddTestCase(new CarrierAggregationTestCase(6, 0, 25, 25, 3), TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(9, 0, 25, 25, 3), TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(12, 0, 25, 25, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(15, 0, 25, 25, 3), + TestCase::Duration::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(1, 4800, 25, 25, 3), TestCase::QUICK); - AddTestCase(new CarrierAggregationTestCase(3, 4800, 25, 25, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(6, 4800, 25, 25, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(9, 4800, 25, 25, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(12, 4800, 25, 25, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(15, 4800, 25, 25, 3), TestCase::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(1, 4800, 25, 25, 3), TestCase::Duration::QUICK); + AddTestCase(new CarrierAggregationTestCase(3, 4800, 25, 25, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(6, 4800, 25, 25, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(9, 4800, 25, 25, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(12, 4800, 25, 25, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(15, 4800, 25, 25, 3), + TestCase::Duration::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(1, 6000, 25, 25, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(3, 6000, 25, 25, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(6, 6000, 25, 25, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(9, 6000, 25, 25, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(12, 6000, 25, 25, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(15, 6000, 25, 25, 3), TestCase::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(1, 6000, 25, 25, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(3, 6000, 25, 25, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(6, 6000, 25, 25, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(9, 6000, 25, 25, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(12, 6000, 25, 25, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(15, 6000, 25, 25, 3), + TestCase::Duration::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(1, 20000, 25, 25, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(3, 20000, 25, 25, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(6, 20000, 25, 25, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(9, 20000, 25, 25, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(12, 20000, 25, 25, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(15, 20000, 25, 25, 3), TestCase::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(1, 20000, 25, 25, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(3, 20000, 25, 25, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(6, 20000, 25, 25, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(9, 20000, 25, 25, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(12, 20000, 25, 25, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(15, 20000, 25, 25, 3), + TestCase::Duration::EXTENSIVE); // bandwidth = 6 RB and there are 3 carriers - AddTestCase(new CarrierAggregationTestCase(1, 0, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(3, 0, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(6, 0, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(9, 0, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(12, 0, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(15, 0, 6, 6, 3), TestCase::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(1, 0, 6, 6, 3), TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(3, 0, 6, 6, 3), TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(6, 0, 6, 6, 3), TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(9, 0, 6, 6, 3), TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(12, 0, 6, 6, 3), TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(15, 0, 6, 6, 3), TestCase::Duration::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(1, 4800, 6, 6, 3), TestCase::QUICK); - AddTestCase(new CarrierAggregationTestCase(3, 4800, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(6, 4800, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(9, 4800, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(12, 4800, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(15, 4800, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(1, 6000, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(3, 6000, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(6, 6000, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(9, 6000, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(12, 6000, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(15, 6000, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(1, 20000, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(3, 20000, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(6, 20000, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(9, 20000, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(12, 20000, 6, 6, 3), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(15, 20000, 6, 6, 3), TestCase::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(1, 4800, 6, 6, 3), TestCase::Duration::QUICK); + AddTestCase(new CarrierAggregationTestCase(3, 4800, 6, 6, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(6, 4800, 6, 6, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(9, 4800, 6, 6, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(12, 4800, 6, 6, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(15, 4800, 6, 6, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(1, 6000, 6, 6, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(3, 6000, 6, 6, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(6, 6000, 6, 6, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(9, 6000, 6, 6, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(12, 6000, 6, 6, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(15, 6000, 6, 6, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(1, 20000, 6, 6, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(3, 20000, 6, 6, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(6, 20000, 6, 6, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(9, 20000, 6, 6, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(12, 20000, 6, 6, 3), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(15, 20000, 6, 6, 3), + TestCase::Duration::EXTENSIVE); // bandwidth = 6 RB and there are 2 carriers - AddTestCase(new CarrierAggregationTestCase(1, 0, 6, 6, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(3, 0, 6, 6, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(6, 0, 6, 6, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(9, 0, 6, 6, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(12, 0, 6, 6, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(15, 0, 6, 6, 2), TestCase::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(1, 0, 6, 6, 2), TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(3, 0, 6, 6, 2), TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(6, 0, 6, 6, 2), TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(9, 0, 6, 6, 2), TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(12, 0, 6, 6, 2), TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(15, 0, 6, 6, 2), TestCase::Duration::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(1, 4800, 6, 6, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(3, 4800, 6, 6, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(6, 4800, 6, 6, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(9, 4800, 6, 6, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(12, 4800, 6, 6, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(15, 4800, 6, 6, 2), TestCase::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(1, 4800, 6, 6, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(3, 4800, 6, 6, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(6, 4800, 6, 6, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(9, 4800, 6, 6, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(12, 4800, 6, 6, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(15, 4800, 6, 6, 2), + TestCase::Duration::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(1, 6000, 6, 6, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(3, 6000, 6, 6, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(6, 6000, 6, 6, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(9, 6000, 6, 6, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(12, 6000, 6, 6, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(15, 6000, 6, 6, 2), TestCase::QUICK); + AddTestCase(new CarrierAggregationTestCase(1, 6000, 6, 6, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(3, 6000, 6, 6, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(6, 6000, 6, 6, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(9, 6000, 6, 6, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(12, 6000, 6, 6, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(15, 6000, 6, 6, 2), TestCase::Duration::QUICK); - AddTestCase(new CarrierAggregationTestCase(1, 20000, 6, 6, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(3, 20000, 6, 6, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(6, 20000, 6, 6, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(9, 20000, 6, 6, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(12, 20000, 6, 6, 2), TestCase::EXTENSIVE); - AddTestCase(new CarrierAggregationTestCase(15, 20000, 6, 6, 2), TestCase::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(1, 20000, 6, 6, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(3, 20000, 6, 6, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(6, 20000, 6, 6, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(9, 20000, 6, 6, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(12, 20000, 6, 6, 2), + TestCase::Duration::EXTENSIVE); + AddTestCase(new CarrierAggregationTestCase(15, 20000, 6, 6, 2), + TestCase::Duration::EXTENSIVE); } } diff --git a/src/lte/test/lte-test-cell-selection.cc b/src/lte/test/lte-test-cell-selection.cc index cb2a03aef..d7566e435 100644 --- a/src/lte/test/lte-test-cell-selection.cc +++ b/src/lte/test/lte-test-cell-selection.cc @@ -77,7 +77,7 @@ LteCellSelectionTestSuite::LteCellSelectionTestSuite() }; AddTestCase(new LteCellSelectionTestCase("EPC, real RRC", true, false, 60.0 /* isd */, w), - TestCase::QUICK); + TestCase::Duration::QUICK); // IDEAL RRC PROTOCOL @@ -92,7 +92,7 @@ LteCellSelectionTestSuite::LteCellSelectionTestSuite() }; AddTestCase(new LteCellSelectionTestCase("EPC, ideal RRC", true, true, 60.0 /* isd */, w), - TestCase::QUICK); + TestCase::Duration::QUICK); } // end of LteCellSelectionTestSuite::LteCellSelectionTestSuite () 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 1485b7120..fedd8f87e 100644 --- a/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc @@ -95,11 +95,11 @@ LenaTestCqaFfMacSchedulerSuite::LenaTestCqaFfMacSchedulerSuite() // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 > 232000 -> throughput = 232000 bytes/sec // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 < 232000 -> throughput = 185000 bytes/sec AddTestCase(new LenaCqaFfMacSchedulerTestCase1(1, 0, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaCqaFfMacSchedulerTestCase1(3, 0, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaCqaFfMacSchedulerTestCase1(6, 0, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // AddTestCase (new LenaCqaFfMacSchedulerTestCase1 (12,0,183000,185000,200,1,errorModel));// // simulation time = 1.5, otherwise, ul test will fail @@ -122,11 +122,11 @@ LenaTestCqaFfMacSchedulerSuite::LenaTestCqaFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 13 -> 93 bytes * 8/12 UE/TTI -> 62000 < 232000 -> throughput = // 62000 bytes/sec AddTestCase(new LenaCqaFfMacSchedulerTestCase1(1, 4800, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaCqaFfMacSchedulerTestCase1(3, 4800, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaCqaFfMacSchedulerTestCase1(6, 4800, 230500, 125000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // AddTestCase (new LenaCqaFfMacSchedulerTestCase1 (12,4800,115250,62000,200,1,errorModel)); // // simulation time = 1.5, otherwise, ul test will fail @@ -149,11 +149,11 @@ LenaTestCqaFfMacSchedulerSuite::LenaTestCqaFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 < 232000 -> throughput = // 48667 bytes/sec AddTestCase(new LenaCqaFfMacSchedulerTestCase1(1, 6000, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaCqaFfMacSchedulerTestCase1(3, 6000, 232000, 201000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaCqaFfMacSchedulerTestCase1(6, 6000, 198500, 97000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // AddTestCase (new LenaCqaFfMacSchedulerTestCase1 (12,6000,99250,48667,200,1, errorModel)); // // simulation time = 1.5, otherwise, ul test will fail @@ -175,18 +175,18 @@ LenaTestCqaFfMacSchedulerSuite::LenaTestCqaFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 < 232000 -> throughput = 32667 // bytes/sec AddTestCase(new LenaCqaFfMacSchedulerTestCase1(1, 10000, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaCqaFfMacSchedulerTestCase1(3, 10000, 232000, 137000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaCqaFfMacSchedulerTestCase1(6, 10000, 129166, 67000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // AddTestCase (new LenaCqaFfMacSchedulerTestCase1 (12,10000,64583,32667,200,1,errorModel));// // simulation time = 1.5, otherwise, ul test will fail // DOWNLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec // UPLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec AddTestCase(new LenaCqaFfMacSchedulerTestCase1(1, 100000, 0, 0, 200, 1, errorModel), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test Case 2: homogeneous flow test in CQA (different distance) // Traffic1 info @@ -211,7 +211,7 @@ LenaTestCqaFfMacSchedulerSuite::LenaTestCqaFfMacSchedulerSuite() estThrCqaDl1.push_back(132000); // User 2 estimated TTI throughput from CQA estThrCqaDl1.push_back(132000); // User 3 estimated TTI throughput from CQA AddTestCase(new LenaCqaFfMacSchedulerTestCase2(dist1, estThrCqaDl1, packetSize1, 1, errorModel), - TestCase::QUICK); + TestCase::Duration::QUICK); // Traffic2 info // UDP traffic: payload size = 200 bytes, interval = 1 ms @@ -236,7 +236,7 @@ LenaTestCqaFfMacSchedulerSuite::LenaTestCqaFfMacSchedulerSuite() estThrCqaDl2.push_back(230000); // User 2 estimated TTI throughput from CQA estThrCqaDl2.push_back(230000); // User 3 estimated TTI throughput from CQA AddTestCase(new LenaCqaFfMacSchedulerTestCase2(dist2, estThrCqaDl2, packetSize2, 1, errorModel), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test Case 3: heterogeneous flow test in CQA // UDP traffic: payload size = [100,200,300] bytes, interval = 1 ms @@ -258,7 +258,7 @@ LenaTestCqaFfMacSchedulerSuite::LenaTestCqaFfMacSchedulerSuite() estThrCqaDl3.push_back(232000); // User 1 estimated TTI throughput from CQA estThrCqaDl3.push_back(332000); // User 2 estimated TTI throughput from CQA AddTestCase(new LenaCqaFfMacSchedulerTestCase2(dist3, estThrCqaDl3, packetSize3, 1, errorModel), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/lte-test-cqi-generation.cc b/src/lte/test/lte-test-cqi-generation.cc index d522b5054..6ee8087c8 100644 --- a/src/lte/test/lte-test-cqi-generation.cc +++ b/src/lte/test/lte-test-cqi-generation.cc @@ -96,52 +96,52 @@ LteCqiGenerationTestSuite::LteCqiGenerationTestSuite() NS_LOG_INFO("Creating LteCqiGenerationTestSuite"); AddTestCase(new LteCqiGenerationTestCase("UsePdcchForCqiGeneration", false, 4, 2), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteCqiGenerationTestCase("UsePdschForCqiGeneration", true, 28, 2), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteCqiGenerationDlPowerControlTestCase("CqiGenerationWithDlPowerControl", LteRrcSap::PdschConfigDedicated::dB0, LteRrcSap::PdschConfigDedicated::dB0, 4, 2), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteCqiGenerationDlPowerControlTestCase("CqiGenerationWithDlPowerControl", LteRrcSap::PdschConfigDedicated::dB0, LteRrcSap::PdschConfigDedicated::dB_3, 8, 2), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteCqiGenerationDlPowerControlTestCase("CqiGenerationWithDlPowerControl", LteRrcSap::PdschConfigDedicated::dB0, LteRrcSap::PdschConfigDedicated::dB_6, 10, 2), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteCqiGenerationDlPowerControlTestCase("CqiGenerationWithDlPowerControl", LteRrcSap::PdschConfigDedicated::dB1, LteRrcSap::PdschConfigDedicated::dB_6, 12, 2), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteCqiGenerationDlPowerControlTestCase("CqiGenerationWithDlPowerControl", LteRrcSap::PdschConfigDedicated::dB2, LteRrcSap::PdschConfigDedicated::dB_6, 14, 2), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteCqiGenerationDlPowerControlTestCase("CqiGenerationWithDlPowerControl", LteRrcSap::PdschConfigDedicated::dB3, LteRrcSap::PdschConfigDedicated::dB_6, 14, 2), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteCqiGenerationDlPowerControlTestCase("CqiGenerationWithDlPowerControl", LteRrcSap::PdschConfigDedicated::dB3, LteRrcSap::PdschConfigDedicated::dB0, 8, 2), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/lte-test-deactivate-bearer.cc b/src/lte/test/lte-test-deactivate-bearer.cc index 518354661..4e288386b 100644 --- a/src/lte/test/lte-test-deactivate-bearer.cc +++ b/src/lte/test/lte-test-deactivate-bearer.cc @@ -95,7 +95,7 @@ LenaTestBearerDeactivateSuite::LenaTestBearerDeactivateSuite() AddTestCase( new LenaDeactivateBearerTestCase(dist_1, estThrPssDl_1, packetSize_1, 1, errorModel, true), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/lte-test-downlink-power-control.cc b/src/lte/test/lte-test-downlink-power-control.cc index 188e22c83..3b7b15c53 100644 --- a/src/lte/test/lte-test-downlink-power-control.cc +++ b/src/lte/test/lte-test-downlink-power-control.cc @@ -103,7 +103,7 @@ LteDownlinkPowerControlTestSuite::LteDownlinkPowerControlTestSuite() powerTxMap, activeRbs_txpowdB30nrb6run1earfcn500, spectrumValue_txpowdB30nrb6run1earfcn500), - TestCase::QUICK); + TestCase::Duration::QUICK); } { // if power for RB not present, but RB is active, use powerTx @@ -146,7 +146,7 @@ LteDownlinkPowerControlTestSuite::LteDownlinkPowerControlTestSuite() powerTxMap, activeRbs_txpowdB30nrb6run1earfcn500, spectrumValue_txpowdB30nrb6run1earfcn500), - TestCase::QUICK); + TestCase::Duration::QUICK); } { std::vector activeRbs_txpowdB30nrb25run1earfcn500(15); @@ -239,7 +239,7 @@ LteDownlinkPowerControlTestSuite::LteDownlinkPowerControlTestSuite() powerTxMap, activeRbs_txpowdB30nrb25run1earfcn500, spectrumValue_txpowdB30nrb25run1earfcn500), - TestCase::QUICK); + TestCase::Duration::QUICK); } { // if power for RB not present, but RB is active, use powerTx @@ -323,56 +323,56 @@ LteDownlinkPowerControlTestSuite::LteDownlinkPowerControlTestSuite() powerTxMap, activeRbs_txpowdB30nrb25run1earfcn500, spectrumValue_txpowdB30nrb25run1earfcn500), - TestCase::QUICK); + TestCase::Duration::QUICK); } // Downlink DATA and CONTROL channels power comparison AddTestCase(new LteDownlinkPowerControlTestCase(false, LteRrcSap::PdschConfigDedicated::dB0, "DataCtrlPowerDifference_noChange"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteDownlinkPowerControlTestCase(true, LteRrcSap::PdschConfigDedicated::dB_6, "DataCtrlPowerDifference_dB_6"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteDownlinkPowerControlTestCase(true, LteRrcSap::PdschConfigDedicated::dB_4dot77, "DataCtrlPowerDifference_dB_4dot77"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteDownlinkPowerControlTestCase(true, LteRrcSap::PdschConfigDedicated::dB_3, "DataCtrlPowerDifference_dB_3"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteDownlinkPowerControlTestCase(true, LteRrcSap::PdschConfigDedicated::dB_1dot77, "DataCtrlPowerDifference_dB_1dot77"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteDownlinkPowerControlTestCase(true, LteRrcSap::PdschConfigDedicated::dB0, "DataCtrlPowerDifference_dB0"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteDownlinkPowerControlTestCase(true, LteRrcSap::PdschConfigDedicated::dB1, "DataCtrlPowerDifference_dB1"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteDownlinkPowerControlTestCase(true, LteRrcSap::PdschConfigDedicated::dB2, "DataCtrlPowerDifference_dB2"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteDownlinkPowerControlTestCase(true, LteRrcSap::PdschConfigDedicated::dB3, "DataCtrlPowerDifference_dB3"), - TestCase::QUICK); + TestCase::Duration::QUICK); // RrcConnectionReconfiguration test AddTestCase( new LteDownlinkPowerControlRrcConnectionReconfigurationTestCase(false, "RrcConnReconf-IdealRrc"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new LteDownlinkPowerControlRrcConnectionReconfigurationTestCase(true, "RrcConnReconf-RealRrc"), - TestCase::QUICK); + TestCase::Duration::QUICK); } double diff --git a/src/lte/test/lte-test-downlink-sinr.cc b/src/lte/test/lte-test-downlink-sinr.cc index 2221bde6c..45ac1f605 100644 --- a/src/lte/test/lte-test-downlink-sinr.cc +++ b/src/lte/test/lte-test-downlink-sinr.cc @@ -81,9 +81,9 @@ LteDownlinkSinrTestSuite::LteDownlinkSinrTestSuite() (*theoreticalSinr1)[1] = 3.72255684126076; AddTestCase(new LteDownlinkDataSinrTestCase(rxPsd1, theoreticalSinr1, "sdBm = [-46 -48]"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteDownlinkCtrlSinrTestCase(rxPsd1, theoreticalSinr1, "sdBm = [-46 -48]"), - TestCase::QUICK); + TestCase::Duration::QUICK); /** * TX signal #2: Power Spectral Density (W/Hz) of the signal of interest = [-63 -61] dBm and BW @@ -98,9 +98,9 @@ LteDownlinkSinrTestSuite::LteDownlinkSinrTestSuite() (*theoreticalSinr2)[1] = 0.1865697965291756; AddTestCase(new LteDownlinkDataSinrTestCase(rxPsd2, theoreticalSinr2, "sdBm = [-63 -61]"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteDownlinkCtrlSinrTestCase(rxPsd2, theoreticalSinr2, "sdBm = [-63 -61]"), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/lte-test-earfcn.cc b/src/lte/test/lte-test-earfcn.cc index 28c1730d6..a1b79fe12 100644 --- a/src/lte/test/lte-test-earfcn.cc +++ b/src/lte/test/lte-test-earfcn.cc @@ -170,27 +170,31 @@ LteEarfcnTestSuite::LteEarfcnTestSuite() { NS_LOG_FUNCTION(this); - AddTestCase(new LteEarfcnDlTestCase("DL EARFCN=500", 500, 2160e6), TestCase::QUICK); - AddTestCase(new LteEarfcnDlTestCase("DL EARFCN=1000", 1000, 1970e6), TestCase::QUICK); - AddTestCase(new LteEarfcnDlTestCase("DL EARFCN=1301", 1301, 1815.1e6), TestCase::QUICK); - AddTestCase(new LteEarfcnDlTestCase("DL EARFCN=7000", 7000, 0.0), TestCase::QUICK); - AddTestCase(new LteEarfcnDlTestCase("DL EARFCN=20000", 20000, 0.0), TestCase::QUICK); - AddTestCase(new LteEarfcnDlTestCase("DL EARFCN=50000", 50000, 0.0), TestCase::QUICK); + AddTestCase(new LteEarfcnDlTestCase("DL EARFCN=500", 500, 2160e6), TestCase::Duration::QUICK); + AddTestCase(new LteEarfcnDlTestCase("DL EARFCN=1000", 1000, 1970e6), TestCase::Duration::QUICK); + AddTestCase(new LteEarfcnDlTestCase("DL EARFCN=1301", 1301, 1815.1e6), + TestCase::Duration::QUICK); + AddTestCase(new LteEarfcnDlTestCase("DL EARFCN=7000", 7000, 0.0), TestCase::Duration::QUICK); + AddTestCase(new LteEarfcnDlTestCase("DL EARFCN=20000", 20000, 0.0), TestCase::Duration::QUICK); + AddTestCase(new LteEarfcnDlTestCase("DL EARFCN=50000", 50000, 0.0), TestCase::Duration::QUICK); - AddTestCase(new LteEarfcnUlTestCase("UL EARFCN=18100", 18100, 1930e6), TestCase::QUICK); - AddTestCase(new LteEarfcnUlTestCase("UL EARFCN=19000", 19000, 1890e6), TestCase::QUICK); - AddTestCase(new LteEarfcnUlTestCase("UL EARFCN=19400", 19400, 1730e6), TestCase::QUICK); - AddTestCase(new LteEarfcnUlTestCase("UL EARFCN=10", 10, 0.0), TestCase::QUICK); - AddTestCase(new LteEarfcnUlTestCase("UL EARFCN=1000", 1000, 0.0), TestCase::QUICK); - AddTestCase(new LteEarfcnUlTestCase("UL EARFCN=50000", 50000, 0.0), TestCase::QUICK); + AddTestCase(new LteEarfcnUlTestCase("UL EARFCN=18100", 18100, 1930e6), + TestCase::Duration::QUICK); + AddTestCase(new LteEarfcnUlTestCase("UL EARFCN=19000", 19000, 1890e6), + TestCase::Duration::QUICK); + AddTestCase(new LteEarfcnUlTestCase("UL EARFCN=19400", 19400, 1730e6), + TestCase::Duration::QUICK); + AddTestCase(new LteEarfcnUlTestCase("UL EARFCN=10", 10, 0.0), TestCase::Duration::QUICK); + AddTestCase(new LteEarfcnUlTestCase("UL EARFCN=1000", 1000, 0.0), TestCase::Duration::QUICK); + AddTestCase(new LteEarfcnUlTestCase("UL EARFCN=50000", 50000, 0.0), TestCase::Duration::QUICK); - AddTestCase(new LteEarfcnTestCase("EARFCN=500", 500, 2160e6), TestCase::QUICK); - AddTestCase(new LteEarfcnTestCase("EARFCN=1000", 1000, 1970e6), TestCase::QUICK); - AddTestCase(new LteEarfcnTestCase("EARFCN=1301", 1301, 1815.1e6), TestCase::QUICK); - AddTestCase(new LteEarfcnTestCase("EARFCN=8000", 8000, 0.0), TestCase::QUICK); - AddTestCase(new LteEarfcnTestCase("EARFCN=50000", 50000, 0.0), TestCase::QUICK); - AddTestCase(new LteEarfcnTestCase("EARFCN=18100", 18100, 1930e6), TestCase::QUICK); - AddTestCase(new LteEarfcnTestCase("EARFCN=19000", 19000, 1890e6), TestCase::QUICK); - AddTestCase(new LteEarfcnTestCase("EARFCN=19400", 19400, 1730e6), TestCase::QUICK); - AddTestCase(new LteEarfcnTestCase("EARFCN=50000", 50000, 0.0), TestCase::QUICK); + AddTestCase(new LteEarfcnTestCase("EARFCN=500", 500, 2160e6), TestCase::Duration::QUICK); + AddTestCase(new LteEarfcnTestCase("EARFCN=1000", 1000, 1970e6), TestCase::Duration::QUICK); + AddTestCase(new LteEarfcnTestCase("EARFCN=1301", 1301, 1815.1e6), TestCase::Duration::QUICK); + AddTestCase(new LteEarfcnTestCase("EARFCN=8000", 8000, 0.0), TestCase::Duration::QUICK); + AddTestCase(new LteEarfcnTestCase("EARFCN=50000", 50000, 0.0), TestCase::Duration::QUICK); + AddTestCase(new LteEarfcnTestCase("EARFCN=18100", 18100, 1930e6), TestCase::Duration::QUICK); + AddTestCase(new LteEarfcnTestCase("EARFCN=19000", 19000, 1890e6), TestCase::Duration::QUICK); + AddTestCase(new LteEarfcnTestCase("EARFCN=19400", 19400, 1730e6), TestCase::Duration::QUICK); + AddTestCase(new LteEarfcnTestCase("EARFCN=50000", 50000, 0.0), TestCase::Duration::QUICK); } 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 c98b2da52..7d5c74c0e 100644 --- a/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc @@ -78,13 +78,13 @@ LenaTestFdBetFfMacSchedulerSuite::LenaTestFdBetFfMacSchedulerSuite() // after the patch enforcing min 3 PRBs per UE: // 12 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/12 UE/TTI -> 184670 bytes/sec AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(1, 0, 2196000, 2292000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(3, 0, 749000, 749000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(6, 0, 373000, 373000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(12, 0, 185000, 184670, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 4800 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec @@ -98,13 +98,13 @@ LenaTestFdBetFfMacSchedulerSuite::LenaTestFdBetFfMacSchedulerSuite() // after the patch enforcing min 3 PRBs per UE: // 12 users -> 3 PRB at Itbs 13 -> 93 bytes * 8/12 UE/TTI -> 62000 bytes/sec AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(1, 4800, 1383000, 807000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(3, 4800, 469000, 253000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(6, 4800, 233500, 125000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(12, 4800, 113000, 62000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 6000 -> MCS 20 -> Itbs 18 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 18 -> 1191 -> 1191000 byte/sec @@ -117,13 +117,13 @@ LenaTestFdBetFfMacSchedulerSuite::LenaTestFdBetFfMacSchedulerSuite() // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 bytes/sec AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(1, 6000, 1191000, 621000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(3, 6000, 389000, 201000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(6, 6000, 193000, 97000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(12, 6000, 97000, 48667, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 10000 -> MCS 14 -> Itbs 13 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 13 -> 775 -> 775000 byte/sec @@ -137,13 +137,13 @@ LenaTestFdBetFfMacSchedulerSuite::LenaTestFdBetFfMacSchedulerSuite() // after the patch enforcing min 3 PRBs per UE: // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 bytes/sec AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(1, 10000, 775000, 421000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(3, 10000, 253000, 137000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(6, 10000, 125000, 67000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(12, 10000, 61000, 32667, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 20000 -> MCS 8 -> Itbs 8 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 8 -> 421 -> 421000 bytes/sec @@ -157,17 +157,18 @@ LenaTestFdBetFfMacSchedulerSuite::LenaTestFdBetFfMacSchedulerSuite() // after the patch enforcing min 3 PRBs per UE: // 12 users -> 3 PRB at Itbs 2 -> 18 bytes * 8/12 UE/TTI -> 12000 bytes/sec AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(1, 20000, 421000, 137000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(3, 20000, 137000, 41000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(6, 20000, 67000, 22000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(12, 20000, 32000, 12000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec // UPLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec - AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(1, 100000, 0, 0, errorModel), TestCase::QUICK); + AddTestCase(new LenaFdBetFfMacSchedulerTestCase1(1, 100000, 0, 0, errorModel), + TestCase::Duration::QUICK); // Test Case 2: fairness check @@ -191,7 +192,7 @@ LenaTestFdBetFfMacSchedulerSuite::LenaTestFdBetFfMacSchedulerSuite() estThrFdBetUl.push_back(26000); // User 4 estimated TTI throughput from FDBET AddTestCase( new LenaFdBetFfMacSchedulerTestCase2(dist, estAchievableRateDl, estThrFdBetUl, errorModel), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** 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 805f2d046..a1ff9a072 100644 --- a/src/lte/test/lte-test-fdmt-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-fdmt-ff-mac-scheduler.cc @@ -77,13 +77,13 @@ LenaTestFdMtFfMacSchedulerSuite::LenaTestFdMtFfMacSchedulerSuite() // min 3 PRBs per UE: 12 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/12 UE/TTI -> 184670 // bytes/sec AddTestCase(new LenaFdMtFfMacSchedulerTestCase(1, 0, 2196000, 2292000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdMtFfMacSchedulerTestCase(3, 0, 2196000, 749000, errorModel), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LenaFdMtFfMacSchedulerTestCase(6, 0, 2196000, 373000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdMtFfMacSchedulerTestCase(12, 0, 2196000, 184670, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 4800 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 byte/secfor one UE; 0 bytes/sec for other UEs @@ -97,13 +97,13 @@ LenaTestFdMtFfMacSchedulerSuite::LenaTestFdMtFfMacSchedulerSuite() // after the patch enforcing min 3 PRBs per UE: // 12 users -> 3 PRB at Itbs 13 -> 93 bytes * 8/12 UE/TTI -> 62000 bytes/sec AddTestCase(new LenaFdMtFfMacSchedulerTestCase(1, 4800, 1383000, 807000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdMtFfMacSchedulerTestCase(3, 4800, 1383000, 253000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdMtFfMacSchedulerTestCase(6, 4800, 1383000, 125000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdMtFfMacSchedulerTestCase(12, 4800, 1383000, 62000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 6000 -> MCS 20 -> Itbs 18 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 18 -> 1191 -> 1191000 byte/sec for one UE; 0 bytes/sec for other UEs @@ -117,13 +117,13 @@ LenaTestFdMtFfMacSchedulerSuite::LenaTestFdMtFfMacSchedulerSuite() // after the patch enforcing min 3 PRBs per UE: // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 bytes/sec AddTestCase(new LenaFdMtFfMacSchedulerTestCase(1, 6000, 1191000, 621000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdMtFfMacSchedulerTestCase(3, 6000, 1191000, 201000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdMtFfMacSchedulerTestCase(6, 6000, 1191000, 97000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdMtFfMacSchedulerTestCase(12, 6000, 1191000, 48667, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 10000 -> MCS 14 -> Itbs 13 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 13 -> 775 -> 775000 byte/sec for one UE; 0 bytes/sec for other UEs @@ -137,13 +137,13 @@ LenaTestFdMtFfMacSchedulerSuite::LenaTestFdMtFfMacSchedulerSuite() // after the patch enforcing min 3 PRBs per UE: // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 bytes/sec AddTestCase(new LenaFdMtFfMacSchedulerTestCase(1, 10000, 775000, 437000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdMtFfMacSchedulerTestCase(3, 10000, 775000, 137000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdMtFfMacSchedulerTestCase(6, 10000, 775000, 67000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdMtFfMacSchedulerTestCase(12, 10000, 775000, 32667, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DONWLINK - DISTANCE 20000 -> MCS 8 -> Itbs 8 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 8 -> 421 -> 421000 bytes/sec for one UE; 0 bytes/sec for other UEs @@ -157,17 +157,18 @@ LenaTestFdMtFfMacSchedulerSuite::LenaTestFdMtFfMacSchedulerSuite() // after the patch enforcing min 3 PRBs per UE: // 12 users -> 3 PRB at Itbs 2 -> 26 bytes * 8/12 UE/TTI -> 12000 bytes/sec AddTestCase(new LenaFdMtFfMacSchedulerTestCase(1, 20000, 421000, 137000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdMtFfMacSchedulerTestCase(3, 20000, 421000, 41000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdMtFfMacSchedulerTestCase(6, 20000, 421000, 22000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdMtFfMacSchedulerTestCase(12, 20000, 421000, 12000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec // UPLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec - AddTestCase(new LenaFdMtFfMacSchedulerTestCase(1, 100000, 0, 0, errorModel), TestCase::QUICK); + AddTestCase(new LenaFdMtFfMacSchedulerTestCase(1, 100000, 0, 0, errorModel), + TestCase::Duration::QUICK); } /** 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 540d9292e..5ed09403e 100644 --- a/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc @@ -93,11 +93,11 @@ LenaTestFdTbfqFfMacSchedulerSuite::LenaTestFdTbfqFfMacSchedulerSuite() // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 > 232000 -> throughput = 232000 bytes/sec // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 < 232000 -> throughput = 185000 bytes/sec AddTestCase(new LenaFdTbfqFfMacSchedulerTestCase1(1, 0, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdTbfqFfMacSchedulerTestCase1(3, 0, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdTbfqFfMacSchedulerTestCase1(6, 0, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,183000,185000,200,1,errorModel));// // simulation time = 1.5, otherwise, ul test will fail @@ -119,11 +119,11 @@ LenaTestFdTbfqFfMacSchedulerSuite::LenaTestFdTbfqFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 13 -> 93 bytes * 8/12 UE/TTI -> 62000 < 232000 -> throughput = // 62000 bytes/sec AddTestCase(new LenaFdTbfqFfMacSchedulerTestCase1(1, 4800, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdTbfqFfMacSchedulerTestCase1(3, 4800, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdTbfqFfMacSchedulerTestCase1(6, 4800, 230500, 125000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,4800,75250,62000,200,1,errorModel)); // // simulation time = 1.5, otherwise, ul test will fail @@ -146,11 +146,11 @@ LenaTestFdTbfqFfMacSchedulerSuite::LenaTestFdTbfqFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 < 232000 -> throughput = // 48667 bytes/sec AddTestCase(new LenaFdTbfqFfMacSchedulerTestCase1(1, 6000, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdTbfqFfMacSchedulerTestCase1(3, 6000, 232000, 201000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdTbfqFfMacSchedulerTestCase1(6, 6000, 198500, 97000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,6000,99250,48667,200,1, errorModel)); // // simulation time = 1.5, otherwise, ul test will fail @@ -172,11 +172,11 @@ LenaTestFdTbfqFfMacSchedulerSuite::LenaTestFdTbfqFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 < 232000 -> throughput = 32667 // bytes/sec AddTestCase(new LenaFdTbfqFfMacSchedulerTestCase1(1, 10000, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdTbfqFfMacSchedulerTestCase1(3, 10000, 232000, 137000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaFdTbfqFfMacSchedulerTestCase1(6, 10000, 129166, 67000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 // (12,10000,64583,32667,200,1,errorModel));// simulation time = 1.5, otherwise, ul test will // fail @@ -184,7 +184,7 @@ LenaTestFdTbfqFfMacSchedulerSuite::LenaTestFdTbfqFfMacSchedulerSuite() // DOWNLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec // UPLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec AddTestCase(new LenaFdTbfqFfMacSchedulerTestCase1(1, 100000, 0, 0, 200, 1, errorModel), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test Case 2: homogeneous flow test in FDTBFQ (different distance) // Traffic1 info @@ -210,7 +210,7 @@ LenaTestFdTbfqFfMacSchedulerSuite::LenaTestFdTbfqFfMacSchedulerSuite() estThrFdTbfqDl1.push_back(132000); // User 3 estimated TTI throughput from FDTBFQ AddTestCase( new LenaFdTbfqFfMacSchedulerTestCase2(dist1, estThrFdTbfqDl1, packetSize1, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // Traffic2 info // UDP traffic: payload size = 300 bytes, interval = 1 ms @@ -236,7 +236,7 @@ LenaTestFdTbfqFfMacSchedulerSuite::LenaTestFdTbfqFfMacSchedulerSuite() estThrFdTbfqDl2.push_back(302266); // User 3 estimated TTI throughput from FDTBFQ AddTestCase( new LenaFdTbfqFfMacSchedulerTestCase2(dist2, estThrFdTbfqDl2, packetSize2, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // Test Case 3: heterogeneous flow test in FDTBFQ // UDP traffic: payload size = [100,200,300] bytes, interval = 1 ms @@ -259,7 +259,7 @@ LenaTestFdTbfqFfMacSchedulerSuite::LenaTestFdTbfqFfMacSchedulerSuite() estThrFdTbfqDl3.push_back(332000); // User 2 estimated TTI throughput from FDTBFQ AddTestCase( new LenaFdTbfqFfMacSchedulerTestCase2(dist3, estThrFdTbfqDl3, packetSize3, 1, errorModel), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/lte-test-frequency-reuse.cc b/src/lte/test/lte-test-frequency-reuse.cc index 8cbccfef8..b81407660 100644 --- a/src/lte/test/lte-test-frequency-reuse.cc +++ b/src/lte/test/lte-test-frequency-reuse.cc @@ -86,7 +86,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() 12, availableDlRb, availableUlRb), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHardFrTestCase("DownlinkHardFrPf2", 5, "ns3::PfFfMacScheduler", @@ -98,7 +98,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() 12, availableDlRb, availableUlRb), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHardFrTestCase("DownlinkHardFrPss1", 1, "ns3::PssFfMacScheduler", @@ -110,7 +110,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() 12, availableDlRb, availableUlRb), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHardFrTestCase("DownlinkHardFrPss2", 5, "ns3::PssFfMacScheduler", @@ -122,7 +122,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() 12, availableDlRb, availableUlRb), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHardFrTestCase("DownlinkHardFrCqa1", 1, "ns3::CqaFfMacScheduler", @@ -134,7 +134,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() 12, availableDlRb, availableUlRb), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHardFrTestCase("DownlinkHardFrCqa2", 5, "ns3::CqaFfMacScheduler", @@ -146,7 +146,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() 12, availableDlRb, availableUlRb), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHardFrTestCase("DownlinkHardFrFdTbfq1", 1, "ns3::FdTbfqFfMacScheduler", @@ -158,7 +158,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() 12, availableDlRb, availableUlRb), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHardFrTestCase("DownlinkHardFrFdTbfq2", 5, "ns3::FdTbfqFfMacScheduler", @@ -170,7 +170,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() 12, availableDlRb, availableUlRb), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHardFrTestCase("DownlinkHardFrTdTbfq1", 1, "ns3::TdTbfqFfMacScheduler", @@ -182,7 +182,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() 12, availableDlRb, availableUlRb), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHardFrTestCase("DownlinkHardFrTdTbfq2", 5, "ns3::TdTbfqFfMacScheduler", @@ -194,7 +194,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() 12, availableDlRb, availableUlRb), - TestCase::QUICK); + TestCase::Duration::QUICK); availableDlRb.clear(); availableUlRb.clear(); @@ -232,7 +232,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() 6, availableDlRb, availableUlRb), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteStrictFrTestCase("DownlinkStrictFrPf2", 5, "ns3::PfFfMacScheduler", @@ -246,7 +246,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() 6, availableDlRb, availableUlRb), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteStrictFrTestCase("DownlinkStrictFrPss1", 1, "ns3::PssFfMacScheduler", @@ -260,7 +260,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() 6, availableDlRb, availableUlRb), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteStrictFrTestCase("DownlinkStrictFrPss2", 5, "ns3::PssFfMacScheduler", @@ -274,7 +274,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() 6, availableDlRb, availableUlRb), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteStrictFrTestCase("DownlinkStrictFrCqa1", 1, "ns3::CqaFfMacScheduler", @@ -288,7 +288,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() 6, availableDlRb, availableUlRb), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteStrictFrTestCase("DownlinkStrictFrCqa2", 5, "ns3::CqaFfMacScheduler", @@ -302,7 +302,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() 6, availableDlRb, availableUlRb), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteStrictFrTestCase("DownlinkStrictFrCqaFdTbfq1", 1, "ns3::FdTbfqFfMacScheduler", @@ -316,7 +316,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() 6, availableDlRb, availableUlRb), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteStrictFrTestCase("DownlinkStrictFrCqaFdTbfq2", 5, "ns3::FdTbfqFfMacScheduler", @@ -330,7 +330,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() 6, availableDlRb, availableUlRb), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteStrictFrTestCase("DownlinkStrictFrCqaTdTbfq1", 1, "ns3::TdTbfqFfMacScheduler", @@ -344,7 +344,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() 6, availableDlRb, availableUlRb), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteStrictFrTestCase("DownlinkStrictFrCqaTdTbfq2", 5, "ns3::TdTbfqFfMacScheduler", @@ -358,80 +358,80 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() 6, availableDlRb, availableUlRb), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteStrictFrAreaTestCase("LteStrictFrAreaTestCasePf1", "ns3::PfFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new LteStrictFrAreaTestCase("LteStrictFrAreaTestCasePss1", "ns3::PssFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new LteStrictFrAreaTestCase("LteStrictFrAreaTestCaseCqa1", "ns3::CqaFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new LteStrictFrAreaTestCase("LteStrictFrAreaTestCaseFdTbfq1", "ns3::FdTbfqFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new LteStrictFrAreaTestCase("LteStrictFrAreaTestCaseTdTbfq1", "ns3::TdTbfqFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteSoftFrAreaTestCase("LteSoftFrAreaTestCasePf1", "ns3::PfFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteSoftFrAreaTestCase("LteSoftFrAreaTestCasePss1", "ns3::PssFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteSoftFrAreaTestCase("LteSoftFrAreaTestCaseCqa1", "ns3::CqaFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new LteSoftFrAreaTestCase("LteSoftFrAreaTestCaseFdTbfq1", "ns3::FdTbfqFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new LteSoftFrAreaTestCase("LteSoftFrAreaTestCaseTdTbfq1", "ns3::TdTbfqFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteSoftFfrAreaTestCase("LteSoftFfrAreaTestCasePf1", "ns3::PfFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteSoftFfrAreaTestCase("LteSoftFfrAreaTestCasePss1", "ns3::PssFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteSoftFfrAreaTestCase("LteSoftFfrAreaTestCaseCqa1", "ns3::CqaFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new LteSoftFfrAreaTestCase("LteSoftFfrAreaTestCaseFdTbfq1", "ns3::FdTbfqFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new LteSoftFfrAreaTestCase("LteSoftFfrAreaTestCaseTdTbfq1", "ns3::TdTbfqFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new LteEnhancedFfrAreaTestCase("LteEnhancedFfrAreaTestCasePf1", "ns3::PfFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new LteEnhancedFfrAreaTestCase("LteEnhancedFfrAreaTestCasePss1", "ns3::PssFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new LteEnhancedFfrAreaTestCase("LteEnhancedFfrAreaTestCaseCqa1", "ns3::CqaFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteEnhancedFfrAreaTestCase("LteEnhancedFfrAreaTestCaseFdTbfq1", "ns3::FdTbfqFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteEnhancedFfrAreaTestCase("LteEnhancedFfrAreaTestCaseTdTbfq1", "ns3::TdTbfqFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteDistributedFfrAreaTestCase("LteDistributedFfrAreaTestCasePf1", "ns3::PfFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteDistributedFfrAreaTestCase("LteDistributedFfrAreaTestCasePss1", "ns3::PssFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteDistributedFfrAreaTestCase("LteDistributedFfrAreaTestCaseCqa1", "ns3::CqaFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteDistributedFfrAreaTestCase("LteDistributedFfrAreaTestCaseFdTbfq1", "ns3::FdTbfqFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteDistributedFfrAreaTestCase("LteDistributedFfrAreaTestCaseTdTbfq1", "ns3::TdTbfqFfMacScheduler"), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/lte-test-harq.cc b/src/lte/test/lte-test-harq.cc index ca8184d8a..29dff474f 100644 --- a/src/lte/test/lte-test-harq.cc +++ b/src/lte/test/lte-test-harq.cc @@ -64,13 +64,13 @@ LenaTestHarqSuite::LenaTestHarqSuite() // MCS 0 TB size of 66 bytes SINR -9.91 dB expected throughput 31822 bytes/s // TBLER 1st tx 1.0 // TBLER 2nd tx 0.074 - AddTestCase(new LenaHarqTestCase(2, 2400, 66, 0.12, 31822), TestCase::QUICK); + AddTestCase(new LenaHarqTestCase(2, 2400, 66, 0.12, 31822), TestCase::Duration::QUICK); // Tests on DL/UL Data channels (PDSCH, PUSCH) // MCS 10 TB size of 472 bytes SINR 0.3 dB expected throughput 209964 bytes/s // TBLER 1st tx 1.0 // TBLER 2nd tx 0.248 - AddTestCase(new LenaHarqTestCase(1, 770, 472, 0.06, 209964), TestCase::QUICK); + AddTestCase(new LenaHarqTestCase(1, 770, 472, 0.06, 209964), TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/lte-test-interference-fr.cc b/src/lte/test/lte-test-interference-fr.cc index b3030b8e8..083d5f07a 100644 --- a/src/lte/test/lte-test-interference-fr.cc +++ b/src/lte/test/lte-test-interference-fr.cc @@ -61,25 +61,25 @@ LteInterferenceFrTestSuite::LteInterferenceFrTestSuite() 20.000000, 356449.932732, 10803.280215), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteInterferenceHardFrTestCase("d1=50, d2=50", 50.000000, 50.000000, 356449.932732, 10803.280215), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteInterferenceHardFrTestCase("d1=50, d2=200", 50.000000, 200.000000, 356449.932732, 10803.280215), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteInterferenceHardFrTestCase("d1=50, d2=500", 50.000000, 500.000000, 356449.932732, 10803.280215), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteInterferenceStrictFrTestCase("d1=50, d2=20", 50.000000, @@ -89,7 +89,7 @@ LteInterferenceFrTestSuite::LteInterferenceFrTestSuite() 356449.932732, 10803.280215, 18), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteInterferenceStrictFrTestCase("d1=50, d2=50", 50.000000, 50.000000, @@ -98,7 +98,7 @@ LteInterferenceFrTestSuite::LteInterferenceFrTestSuite() 356449.932732, 10803.280215, 28), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteInterferenceStrictFrTestCase("d1=50, d2=200", 50.000000, 200.000000, @@ -107,7 +107,7 @@ LteInterferenceFrTestSuite::LteInterferenceFrTestSuite() 356449.932732, 10803.280215, 30), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteInterferenceStrictFrTestCase("d1=50, d2=500", 50.000000, 500.000000, @@ -116,7 +116,7 @@ LteInterferenceFrTestSuite::LteInterferenceFrTestSuite() 356449.932732, 10803.280215, 30), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/lte-test-interference.cc b/src/lte/test/lte-test-interference.cc index 33e919394..6b10ec40a 100644 --- a/src/lte/test/lte-test-interference.cc +++ b/src/lte/test/lte-test-interference.cc @@ -71,9 +71,9 @@ LteInterferenceTestSuite::LteInterferenceTestSuite() // range) // TODO: update the test conditions to handle out-of-range correctly // AddTestCase (new LteInterferenceTestCase ("d1=50, d2=10", 50.000000, 10.000000, 0.040000, - // 0.040000, 0.010399, 0.010399, 0, 0), TestCase::QUICK); AddTestCase (new + // 0.040000, 0.010399, 0.010399, 0, 0), TestCase::Duration::QUICK); AddTestCase (new // LteInterferenceTestCase ("d1=50, d2=20", 50.000000, 20.000000, 0.160000, 0.159998, - // 0.041154, 0.041153, 0, 0), TestCase::QUICK); + // 0.041154, 0.041153, 0, 0), TestCase::Duration::QUICK); AddTestCase(new LteInterferenceTestCase("d1=3000, d2=6000", 3000.000000, @@ -84,7 +84,7 @@ LteInterferenceTestSuite::LteInterferenceTestSuite() 0.389662, 6, 4), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteInterferenceTestCase("d1=50, d2=50", 50.000000, 50.000000, @@ -94,7 +94,7 @@ LteInterferenceTestSuite::LteInterferenceTestSuite() 0.239808, 2, 2), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteInterferenceTestCase("d1=50, d2=100", 50.000000, 100.000000, @@ -104,7 +104,7 @@ LteInterferenceTestSuite::LteInterferenceTestSuite() 0.785042, 6, 6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteInterferenceTestCase("d1=50, d2=200", 50.000000, 200.000000, @@ -114,7 +114,7 @@ LteInterferenceTestSuite::LteInterferenceTestSuite() 1.959533, 14, 14), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteInterferenceTestCase("d1=50, d2=500", 50.000000, 500.000000, @@ -124,7 +124,7 @@ LteInterferenceTestSuite::LteInterferenceTestSuite() 4.241793, 22, 22), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteInterferenceTestCase("d1=50, d2=1000", 50.000000, 1000.000000, @@ -134,7 +134,7 @@ LteInterferenceTestSuite::LteInterferenceTestSuite() 6.144825, 28, 28), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteInterferenceTestCase("d1=50, d2=10000", 50.000000, 10000.000000, @@ -144,7 +144,7 @@ LteInterferenceTestSuite::LteInterferenceTestSuite() 10.588084, 28, 28), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteInterferenceTestCase("d1=50, d2=100000", 50.000000, 100000.000000, @@ -154,7 +154,7 @@ LteInterferenceTestSuite::LteInterferenceTestSuite() 10.928917, 28, 28), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteInterferenceTestCase("d1=50, d2=1000000", 50.000000, 1000000.000000, @@ -164,7 +164,7 @@ LteInterferenceTestSuite::LteInterferenceTestSuite() 10.932767, 28, 28), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteInterferenceTestCase("d1=4500, d2=12600", 4500.000000, 12600.000000, @@ -174,7 +174,7 @@ LteInterferenceTestSuite::LteInterferenceTestSuite() 0.270399, 8, 2), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteInterferenceTestCase("d1=5400, d2=12600", 5400.000000, 12600.000000, @@ -184,7 +184,7 @@ LteInterferenceTestSuite::LteInterferenceTestSuite() 0.193019, 6, 0), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/lte-test-ipv6-routing.cc b/src/lte/test/lte-test-ipv6-routing.cc index 1f20f98d0..68e5e2b6c 100644 --- a/src/lte/test/lte-test-ipv6-routing.cc +++ b/src/lte/test/lte-test-ipv6-routing.cc @@ -389,7 +389,7 @@ class LteIpv6RoutingTestSuite : public TestSuite LteIpv6RoutingTestSuite::LteIpv6RoutingTestSuite() : TestSuite("lte-ipv6-routing-test", UNIT) { - AddTestCase(new LteIpv6RoutingTestCase, TestCase::QUICK); + 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 0c72f614a..95f393938 100644 --- a/src/lte/test/lte-test-link-adaptation.cc +++ b/src/lte/test/lte-test-link-adaptation.cc @@ -101,7 +101,7 @@ LteLinkAdaptationTestSuite::LteLinkAdaptationTestSuite() snrEfficiencyMcs[i].snrDb, lossDb, snrEfficiencyMcs[i].mcsIndex), - TestCase::QUICK); + TestCase::Duration::QUICK); } } diff --git a/src/lte/test/lte-test-mimo.cc b/src/lte/test/lte-test-mimo.cc index e1768a47d..23b0d2aac 100644 --- a/src/lte/test/lte-test-mimo.cc +++ b/src/lte/test/lte-test-mimo.cc @@ -72,13 +72,13 @@ LenaTestMimoSuite::LenaTestMimoSuite() estThrDl.push_back(183600); // interval 2 : estimated throughput for TxMode 2 estThrDl.push_back(193400); // interval 3 : estimated throughput for TxMode 3 AddTestCase(new LenaMimoTestCase(300, estThrDl, "ns3::RrFfMacScheduler", true), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LenaMimoTestCase(300, estThrDl, "ns3::PfFfMacScheduler", true), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LenaMimoTestCase(300, estThrDl, "ns3::RrFfMacScheduler", false), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LenaMimoTestCase(300, estThrDl, "ns3::PfFfMacScheduler", false), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/lte-test-pathloss-model.cc b/src/lte/test/lte-test-pathloss-model.cc index 95e35299e..2df8a3a77 100644 --- a/src/lte/test/lte-test-pathloss-model.cc +++ b/src/lte/test/lte-test-pathloss-model.cc @@ -137,7 +137,7 @@ LtePathlossModelTestSuite::LtePathlossModelTestSuite() name << " snr= " << sinrDb << " dB, " << " mcs= " << snrEfficiencyMcs[i].mcsIndex; AddTestCase(new LtePathlossModelSystemTestCase(name.str(), sinrDb, dist[i], mcs), - TestCase::QUICK); + TestCase::Duration::QUICK); } } 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 a16909b5a..412dac1ca 100644 --- a/src/lte/test/lte-test-pf-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-pf-ff-mac-scheduler.cc @@ -77,15 +77,15 @@ LenaTestPfFfMacSchedulerSuite::LenaTestPfFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/12 UE/TTI -> 184670 bytes/sec // 15 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/15 UE/TTI -> 147730 bytes/sec AddTestCase(new LenaPfFfMacSchedulerTestCase1(1, 0, 2196000, 2292000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPfFfMacSchedulerTestCase1(3, 0, 732000, 749000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPfFfMacSchedulerTestCase1(6, 0, 366000, 373000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPfFfMacSchedulerTestCase1(12, 0, 183000, 184670, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPfFfMacSchedulerTestCase1(15, 0, 146400, 147730, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 4800 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 15 -> 1383 -> 1383000 bytes/sec @@ -101,15 +101,15 @@ LenaTestPfFfMacSchedulerSuite::LenaTestPfFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 13 -> 93 bytes * 8/12 UE/TTI -> 62000 bytes/sec // 15 users -> 3 PRB at Itbs 13 -> 93 bytes * 8/15 UE/TTI -> 49600 bytes/sec AddTestCase(new LenaPfFfMacSchedulerTestCase1(1, 4800, 1383000, 807000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPfFfMacSchedulerTestCase1(3, 4800, 461000, 253000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPfFfMacSchedulerTestCase1(6, 4800, 230500, 125000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPfFfMacSchedulerTestCase1(12, 4800, 115250, 62000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPfFfMacSchedulerTestCase1(15, 4800, 92200, 49600, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 6000 -> MCS 20 -> Itbs 18 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 20 -> 1191 -> 1191000 bytes/sec @@ -125,15 +125,15 @@ LenaTestPfFfMacSchedulerSuite::LenaTestPfFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 bytes/sec // 15 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/15 UE/TTI -> 38993 bytes/sec AddTestCase(new LenaPfFfMacSchedulerTestCase1(1, 6000, 1191000, 621000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPfFfMacSchedulerTestCase1(3, 6000, 397000, 201000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPfFfMacSchedulerTestCase1(6, 6000, 198500, 97000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPfFfMacSchedulerTestCase1(12, 6000, 99250, 48667, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPfFfMacSchedulerTestCase1(15, 6000, 79400, 38993, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 10000 -> MCS 14 -> Itbs 13 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 13 -> 871 -> 775000 bytes/sec @@ -149,15 +149,15 @@ LenaTestPfFfMacSchedulerSuite::LenaTestPfFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 bytes/sec // 15 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/15 UE/TTI -> 26133 bytes/sec AddTestCase(new LenaPfFfMacSchedulerTestCase1(1, 10000, 775000, 437000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPfFfMacSchedulerTestCase1(3, 10000, 258333, 137000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPfFfMacSchedulerTestCase1(6, 10000, 129167, 67000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPfFfMacSchedulerTestCase1(12, 10000, 64583, 32667, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPfFfMacSchedulerTestCase1(15, 10000, 51667, 26133, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DONWLINK - DISTANCE 20000 -> MCS 8 -> Itbs 8 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 8 -> 421 -> 421000 bytes/sec @@ -173,19 +173,20 @@ LenaTestPfFfMacSchedulerSuite::LenaTestPfFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 2 -> 26 bytes * 8/12 UE/TTI -> 12000 bytes/sec // 15 users -> 3 PRB at Itbs 2 -> 26 bytes * 8/15 UE/TTI -> 9600 bytes/sec AddTestCase(new LenaPfFfMacSchedulerTestCase1(1, 20000, 421000, 137000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPfFfMacSchedulerTestCase1(3, 20000, 140333, 41000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPfFfMacSchedulerTestCase1(6, 20000, 70167, 22000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPfFfMacSchedulerTestCase1(12, 20000, 35083, 12000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPfFfMacSchedulerTestCase1(15, 20000, 28067, 9600, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec // UPLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec - AddTestCase(new LenaPfFfMacSchedulerTestCase1(1, 100000, 0, 0, errorModel), TestCase::QUICK); + AddTestCase(new LenaPfFfMacSchedulerTestCase1(1, 100000, 0, 0, errorModel), + TestCase::Duration::QUICK); // Test Case 2: fairness check @@ -208,7 +209,7 @@ LenaTestPfFfMacSchedulerSuite::LenaTestPfFfMacSchedulerSuite() estThrPfUl.push_back(85000); // User 3 estimated TTI throughput from PF estThrPfUl.push_back(26000); // User 4 estimated TTI throughput from PF AddTestCase(new LenaPfFfMacSchedulerTestCase2(dist, estThrPfDl, estThrPfUl, errorModel), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/lte-test-phy-error-model.cc b/src/lte/test/lte-test-phy-error-model.cc index 17317fa1c..4a611fdc9 100644 --- a/src/lte/test/lte-test-phy-error-model.cc +++ b/src/lte/test/lte-test-phy-error-model.cc @@ -73,16 +73,19 @@ LenaTestPhyErrorModelSuite::LenaTestPhyErrorModelSuite() // 1 interfering eNB SINR -2.0 BLER 0.007 TB size 217 AddTestCase(new LenaDlCtrlPhyErrorModelTestCase(2, 1078, 0.007, 9, Seconds(0.04), rngRun), - (rngRun == 1) ? TestCase::QUICK : TestCase::TAKES_FOREVER); + (rngRun == 1) ? TestCase::Duration::QUICK : TestCase::Duration::TAKES_FOREVER); // 2 interfering eNBs SINR -4.0 BLER 0.037 TB size 217 AddTestCase(new LenaDlCtrlPhyErrorModelTestCase(3, 1040, 0.045, 21, Seconds(0.04), rngRun), - (rngRun == 1) ? TestCase::EXTENSIVE : TestCase::TAKES_FOREVER); + (rngRun == 1) ? TestCase::Duration::EXTENSIVE + : TestCase::Duration::TAKES_FOREVER); // 3 interfering eNBs SINR -6.0 BLER 0.21 TB size 133 AddTestCase(new LenaDlCtrlPhyErrorModelTestCase(4, 1250, 0.206, 40, Seconds(0.12), rngRun), - (rngRun == 1) ? TestCase::EXTENSIVE : TestCase::TAKES_FOREVER); + (rngRun == 1) ? TestCase::Duration::EXTENSIVE + : TestCase::Duration::TAKES_FOREVER); // 4 interfering eNBs SINR -7.0 BLER 0.34 TB size 133 AddTestCase(new LenaDlCtrlPhyErrorModelTestCase(5, 1260, 0.343, 47, Seconds(0.12), rngRun), - (rngRun == 1) ? TestCase::EXTENSIVE : TestCase::TAKES_FOREVER); + (rngRun == 1) ? TestCase::Duration::EXTENSIVE + : TestCase::Duration::TAKES_FOREVER); // Tests on DL Data channels (PDSCH) // the tolerance is calculated with the following octave code: @@ -94,23 +97,28 @@ LenaTestPhyErrorModelSuite::LenaTestPhyErrorModelSuite() // MCS 2 TB size of 256 bits BLER 0.33 SINR -5.51 AddTestCase(new LenaDataPhyErrorModelTestCase(4, 1800, 0.33, 39, Seconds(0.04), rngRun), - (rngRun == 1) ? TestCase::QUICK : TestCase::TAKES_FOREVER); + (rngRun == 1) ? TestCase::Duration::QUICK : TestCase::Duration::TAKES_FOREVER); // MCS 2 TB size of 528 bits BLER 0.11 SINR -5.51 AddTestCase(new LenaDataPhyErrorModelTestCase(2, 1800, 0.11, 26, Seconds(0.04), rngRun), - (rngRun == 1) ? TestCase::EXTENSIVE : TestCase::TAKES_FOREVER); + (rngRun == 1) ? TestCase::Duration::EXTENSIVE + : TestCase::Duration::TAKES_FOREVER); // MCS 2 TB size of 1088 bits BLER 0.02 SINR -5.51 AddTestCase(new LenaDataPhyErrorModelTestCase(1, 1800, 0.02, 33, Seconds(0.04), rngRun), - (rngRun == 1) ? TestCase::EXTENSIVE : TestCase::TAKES_FOREVER); + (rngRun == 1) ? TestCase::Duration::EXTENSIVE + : TestCase::Duration::TAKES_FOREVER); // MCS 12 TB size of 4800 bits BLER 0.3 SINR 4.43 AddTestCase(new LenaDataPhyErrorModelTestCase(1, 600, 0.3, 38, Seconds(0.04), rngRun), - (rngRun == 1) ? TestCase::EXTENSIVE : TestCase::TAKES_FOREVER); + (rngRun == 1) ? TestCase::Duration::EXTENSIVE + : TestCase::Duration::TAKES_FOREVER); // MCS 12 TB size of 1632 bits BLER 0.55 SINR 4.43 AddTestCase(new LenaDataPhyErrorModelTestCase(3, 600, 0.55, 40, Seconds(0.04), rngRun), - (rngRun == 1) ? TestCase::EXTENSIVE : TestCase::TAKES_FOREVER); + (rngRun == 1) ? TestCase::Duration::EXTENSIVE + : TestCase::Duration::TAKES_FOREVER); // MCS 16 TB size of 7272 bits (3648 x 3584) BLER 0.14 SINR 8.48 // BLER 0.14 = 1 - ((1-0.075)*(1-0.075)) AddTestCase(new LenaDataPhyErrorModelTestCase(1, 470, 0.14, 29, Seconds(0.04), rngRun), - (rngRun == 1) ? TestCase::EXTENSIVE : TestCase::TAKES_FOREVER); + (rngRun == 1) ? TestCase::Duration::EXTENSIVE + : TestCase::Duration::TAKES_FOREVER); } } diff --git a/src/lte/test/lte-test-primary-cell-change.cc b/src/lte/test/lte-test-primary-cell-change.cc index 775a71f73..751a5b93b 100644 --- a/src/lte/test/lte-test-primary-cell-change.cc +++ b/src/lte/test/lte-test-primary-cell-change.cc @@ -53,47 +53,47 @@ LtePrimaryCellChangeTestSuite::LtePrimaryCellChangeTestSuite() { // 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), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LtePrimaryCellChangeTestCase("real RRC, RngRun=1", false, 1, 1, 0, 1), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test that handover between first carriers of eNBs works. AddTestCase(new LtePrimaryCellChangeTestCase("ideal RRC, RngRun=1", true, 1, 2, 0, 2), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LtePrimaryCellChangeTestCase("real RRC, RngRun=1", false, 1, 2, 0, 2), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test that handover from second carrier of first eNB to first carrier of second eNB works. AddTestCase(new LtePrimaryCellChangeTestCase("ideal RRC, RngRun=1", true, 1, 2, 1, 2), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LtePrimaryCellChangeTestCase("real RRC, RngRun=1", false, 1, 2, 1, 2), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test that handover from first carrier of first eNB to first carrier of second eNB works. AddTestCase(new LtePrimaryCellChangeTestCase("ideal RRC, RngRun=1", true, 1, 2, 0, 3), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LtePrimaryCellChangeTestCase("real RRC, RngRun=1", false, 1, 2, 0, 3), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test that handover from second carrier of first eNB to second carrier of second eNB works. AddTestCase(new LtePrimaryCellChangeTestCase("ideal RRC, RngRun=1", true, 1, 2, 1, 3), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LtePrimaryCellChangeTestCase("real RRC, RngRun=1", false, 1, 2, 1, 3), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test intra-eNB inter-frequency handover. AddTestCase(new LtePrimaryCellChangeTestCase("ideal RRC, RngRun=1", true, 1, 2, 0, 1), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LtePrimaryCellChangeTestCase("real RRC, RngRun=1", false, 1, 2, 0, 1), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LtePrimaryCellChangeTestCase("ideal RRC, RngRun=1", true, 1, 2, 1, 0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LtePrimaryCellChangeTestCase("real RRC, RngRun=1", false, 1, 2, 1, 0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LtePrimaryCellChangeTestCase("ideal RRC, RngRun=1", true, 1, 4, 3, 1), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LtePrimaryCellChangeTestCase("real RRC, RngRun=1", false, 1, 4, 3, 1), - TestCase::QUICK); + TestCase::Duration::QUICK); } // end of LtePrimaryCellChangeTestSuite::LtePrimaryCellChangeTestSuite () /** 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 f175c8b21..4ba8a8e1b 100644 --- a/src/lte/test/lte-test-pss-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-pss-ff-mac-scheduler.cc @@ -93,11 +93,11 @@ LenaTestPssFfMacSchedulerSuite::LenaTestPssFfMacSchedulerSuite() // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 > 232000 -> throughput = 232000 bytes/sec // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 < 232000 -> throughput = 185000 bytes/sec AddTestCase(new LenaPssFfMacSchedulerTestCase1(1, 0, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPssFfMacSchedulerTestCase1(3, 0, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPssFfMacSchedulerTestCase1(6, 0, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,183000,185000,200,1,errorModel));// // simulation time = 1.5, otherwise, ul test will fail @@ -120,11 +120,11 @@ LenaTestPssFfMacSchedulerSuite::LenaTestPssFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 13 -> 93 bytes * 8/12 UE/TTI -> 62000 < 232000 -> throughput = // 62000 bytes/sec AddTestCase(new LenaPssFfMacSchedulerTestCase1(1, 4800, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPssFfMacSchedulerTestCase1(3, 4800, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPssFfMacSchedulerTestCase1(6, 4800, 230500, 125000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,4800,115250,62000,200,1,errorModel)); // // simulation time = 1.5, otherwise, ul test will fail @@ -147,11 +147,11 @@ LenaTestPssFfMacSchedulerSuite::LenaTestPssFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 < 232000 -> throughput = // 48667 bytes/sec AddTestCase(new LenaPssFfMacSchedulerTestCase1(1, 6000, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPssFfMacSchedulerTestCase1(3, 6000, 232000, 201000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPssFfMacSchedulerTestCase1(6, 6000, 198500, 97000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,6000,99250,48667,200,1, errorModel)); // // simulation time = 1.5, otherwise, ul test will fail @@ -173,18 +173,18 @@ LenaTestPssFfMacSchedulerSuite::LenaTestPssFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 < 232000 -> throughput = 32667 // bytes/sec AddTestCase(new LenaPssFfMacSchedulerTestCase1(1, 10000, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPssFfMacSchedulerTestCase1(3, 10000, 232000, 137000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaPssFfMacSchedulerTestCase1(6, 10000, 129166, 67000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,10000,64583,32667,200,1,errorModel));// // simulation time = 1.5, otherwise, ul test will fail // DOWNLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec // UPLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec AddTestCase(new LenaPssFfMacSchedulerTestCase1(1, 100000, 0, 0, 200, 1, errorModel), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test Case 2: homogeneous flow test in PSS (different distance) // Traffic1 info @@ -209,7 +209,7 @@ LenaTestPssFfMacSchedulerSuite::LenaTestPssFfMacSchedulerSuite() estThrPssDl1.push_back(132000); // User 2 estimated TTI throughput from PSS estThrPssDl1.push_back(132000); // User 3 estimated TTI throughput from PSS AddTestCase(new LenaPssFfMacSchedulerTestCase2(dist1, estThrPssDl1, packetSize1, 1, errorModel), - TestCase::QUICK); + TestCase::Duration::QUICK); // Traffic2 info // UDP traffic: payload size = 200 bytes, interval = 1 ms @@ -234,7 +234,7 @@ LenaTestPssFfMacSchedulerSuite::LenaTestPssFfMacSchedulerSuite() estThrPssDl2.push_back(230000); // User 2 estimated TTI throughput from PSS estThrPssDl2.push_back(230000); // User 3 estimated TTI throughput from PSS AddTestCase(new LenaPssFfMacSchedulerTestCase2(dist2, estThrPssDl2, packetSize2, 1, errorModel), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test Case 3: heterogeneous flow test in PSS // UDP traffic: payload size = [100,200,300] bytes, interval = 1 ms @@ -256,7 +256,7 @@ LenaTestPssFfMacSchedulerSuite::LenaTestPssFfMacSchedulerSuite() estThrPssDl3.push_back(232000); // User 1 estimated TTI throughput from PSS estThrPssDl3.push_back(332000); // User 2 estimated TTI throughput from PSS AddTestCase(new LenaPssFfMacSchedulerTestCase2(dist3, estThrPssDl3, packetSize3, 1, errorModel), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/lte-test-radio-link-failure.cc b/src/lte/test/lte-test-radio-link-failure.cc index 1e6d5480a..edc7f2a75 100644 --- a/src/lte/test/lte-test-radio-link-failure.cc +++ b/src/lte/test/lte-test-radio-link-failure.cc @@ -73,7 +73,7 @@ LteRadioLinkFailureTestSuite::LteRadioLinkFailureTestSuite() enbPositionList, ueJumpAwayPosition, checkConnectedList), - TestCase::QUICK); + TestCase::Duration::QUICK); // One eNB: Real RRC PROTOCOL AddTestCase(new LteRadioLinkFailureTestCase(1, @@ -84,7 +84,7 @@ LteRadioLinkFailureTestSuite::LteRadioLinkFailureTestSuite() enbPositionList, ueJumpAwayPosition, checkConnectedList), - TestCase::QUICK); + TestCase::Duration::QUICK); // Two eNBs: Ideal RRC PROTOCOL @@ -99,7 +99,7 @@ LteRadioLinkFailureTestSuite::LteRadioLinkFailureTestSuite() enbPositionList, ueJumpAwayPosition, checkConnectedList), - TestCase::QUICK); + TestCase::Duration::QUICK); // Two eNBs: Ideal RRC PROTOCOL AddTestCase(new LteRadioLinkFailureTestCase(2, @@ -110,7 +110,7 @@ LteRadioLinkFailureTestSuite::LteRadioLinkFailureTestSuite() enbPositionList, ueJumpAwayPosition, checkConnectedList), - TestCase::QUICK); + TestCase::Duration::QUICK); } // end of LteRadioLinkFailureTestSuite::LteRadioLinkFailureTestSuite () diff --git a/src/lte/test/lte-test-rlc-am-e2e.cc b/src/lte/test/lte-test-rlc-am-e2e.cc index ef6926088..d0a508ed7 100644 --- a/src/lte/test/lte-test-rlc-am-e2e.cc +++ b/src/lte/test/lte-test-rlc-am-e2e.cc @@ -77,18 +77,18 @@ LteRlcAmE2eTestSuite::LteRlcAmE2eTestSuite() break; } - TestCase::TestDuration testDuration; + TestCase::Duration testDuration; if (l == 1 && s == 0) { - testDuration = TestCase::QUICK; + testDuration = TestCase::Duration::QUICK; } else if (s <= 4) { - testDuration = TestCase::EXTENSIVE; + testDuration = TestCase::Duration::EXTENSIVE; } else { - testDuration = TestCase::TAKES_FOREVER; + testDuration = TestCase::Duration::TAKES_FOREVER; } AddTestCase(new LteRlcAmE2eTestCase(name.str(), runs[s], losses[l], bulkSduArrival), testDuration); diff --git a/src/lte/test/lte-test-rlc-am-transmitter.cc b/src/lte/test/lte-test-rlc-am-transmitter.cc index 97598591b..fbe312deb 100644 --- a/src/lte/test/lte-test-rlc-am-transmitter.cc +++ b/src/lte/test/lte-test-rlc-am-transmitter.cc @@ -40,11 +40,14 @@ LteRlcAmTransmitterTestSuite::LteRlcAmTransmitterTestSuite() // LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_ALL); // LogComponentEnable ("LteRlcAmTransmitterTest", logLevel); - AddTestCase(new LteRlcAmTransmitterOneSduTestCase("One SDU, one PDU"), TestCase::QUICK); - AddTestCase(new LteRlcAmTransmitterSegmentationTestCase("Segmentation"), TestCase::QUICK); - AddTestCase(new LteRlcAmTransmitterConcatenationTestCase("Concatenation"), TestCase::QUICK); + AddTestCase(new LteRlcAmTransmitterOneSduTestCase("One SDU, one PDU"), + TestCase::Duration::QUICK); + AddTestCase(new LteRlcAmTransmitterSegmentationTestCase("Segmentation"), + TestCase::Duration::QUICK); + AddTestCase(new LteRlcAmTransmitterConcatenationTestCase("Concatenation"), + TestCase::Duration::QUICK); AddTestCase(new LteRlcAmTransmitterReportBufferStatusTestCase("ReportBufferStatus primitive"), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/lte-test-rlc-um-e2e.cc b/src/lte/test/lte-test-rlc-um-e2e.cc index 50c10b466..4dcb920ae 100644 --- a/src/lte/test/lte-test-rlc-um-e2e.cc +++ b/src/lte/test/lte-test-rlc-um-e2e.cc @@ -61,14 +61,14 @@ LteRlcUmE2eTestSuite::LteRlcUmE2eTestSuite() { std::ostringstream name; name << " Losses = " << losses[l] << "%. Seed = " << seeds[s]; - TestCase::TestDuration testDuration; + TestCase::Duration testDuration; if (l == 1 && s == 0) { - testDuration = TestCase::QUICK; + testDuration = TestCase::Duration::QUICK; } else { - testDuration = TestCase::EXTENSIVE; + testDuration = TestCase::Duration::EXTENSIVE; } AddTestCase(new LteRlcUmE2eTestCase(name.str(), seeds[s], losses[l]), testDuration); } diff --git a/src/lte/test/lte-test-rlc-um-transmitter.cc b/src/lte/test/lte-test-rlc-um-transmitter.cc index 52a785f28..db6ff78d7 100644 --- a/src/lte/test/lte-test-rlc-um-transmitter.cc +++ b/src/lte/test/lte-test-rlc-um-transmitter.cc @@ -42,11 +42,14 @@ LteRlcUmTransmitterTestSuite::LteRlcUmTransmitterTestSuite() // NS_LOG_INFO ("Creating LteRlcUmTransmitterTestSuite"); - AddTestCase(new LteRlcUmTransmitterOneSduTestCase("One SDU, one PDU"), TestCase::QUICK); - AddTestCase(new LteRlcUmTransmitterSegmentationTestCase("Segmentation"), TestCase::QUICK); - AddTestCase(new LteRlcUmTransmitterConcatenationTestCase("Concatenation"), TestCase::QUICK); + AddTestCase(new LteRlcUmTransmitterOneSduTestCase("One SDU, one PDU"), + TestCase::Duration::QUICK); + AddTestCase(new LteRlcUmTransmitterSegmentationTestCase("Segmentation"), + TestCase::Duration::QUICK); + AddTestCase(new LteRlcUmTransmitterConcatenationTestCase("Concatenation"), + TestCase::Duration::QUICK); AddTestCase(new LteRlcUmTransmitterReportBufferStatusTestCase("ReportBufferStatus primitive"), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** 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 837cae6d3..6abc16fd1 100644 --- a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc @@ -75,17 +75,17 @@ LenaTestRrFfMacSchedulerSuite::LenaTestRrFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/12 UE/TTI -> 184670 bytes/sec // 15 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/15 UE/TTI -> 147730 bytes/sec AddTestCase(new LenaRrFfMacSchedulerTestCase(1, 0, 2196000, 2292000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaRrFfMacSchedulerTestCase(3, 0, 749000, 749000, errorModel), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LenaRrFfMacSchedulerTestCase(6, 0, 373000, 373000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaRrFfMacSchedulerTestCase(9, 0, 185000, 246220, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaRrFfMacSchedulerTestCase(12, 0, 185000, 184670, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaRrFfMacSchedulerTestCase(15, 0, 148000, 147730, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 4800 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec @@ -103,17 +103,17 @@ LenaTestRrFfMacSchedulerSuite::LenaTestRrFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 13 -> 93 bytes * 8/12 UE/TTI -> 62000 bytes/sec // 15 users -> 3 PRB at Itbs 13 -> 93 bytes * 8/15 UE/TTI -> 49600 bytes/sec AddTestCase(new LenaRrFfMacSchedulerTestCase(1, 4800, 1383000, 807000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaRrFfMacSchedulerTestCase(3, 4800, 469000, 253000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaRrFfMacSchedulerTestCase(6, 4800, 233000, 125000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaRrFfMacSchedulerTestCase(9, 4800, 113000, 82667, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaRrFfMacSchedulerTestCase(12, 4800, 113000, 62000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaRrFfMacSchedulerTestCase(15, 4800, 90400, 49600, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 6000 -> MCS 20 -> Itbs 18 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 15 -> 1191 -> 1191000 bytes/sec @@ -130,17 +130,17 @@ LenaTestRrFfMacSchedulerSuite::LenaTestRrFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 bytes/sec // 15 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/15 UE/TTI -> 38993 bytes/sec AddTestCase(new LenaRrFfMacSchedulerTestCase(1, 6000, 1191000, 621000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaRrFfMacSchedulerTestCase(3, 6000, 389000, 201000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaRrFfMacSchedulerTestCase(6, 6000, 193000, 97000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaRrFfMacSchedulerTestCase(9, 6000, 97000, 64889, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaRrFfMacSchedulerTestCase(12, 6000, 97000, 48667, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaRrFfMacSchedulerTestCase(15, 6000, 77600, 38993, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 20000 -> MCS 8 -> Itbs 8 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 8 -> 421 -> 421000 bytes/sec @@ -158,21 +158,22 @@ LenaTestRrFfMacSchedulerSuite::LenaTestRrFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 2 -> 18 bytes * 8/12 UE/TTI -> 12000 bytes/sec // 15 users -> 3 PRB at Itbs 2 -> 18 bytes * 8/15 UE/TTI -> 9600 bytes/sec AddTestCase(new LenaRrFfMacSchedulerTestCase(1, 20000, 421000, 137000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaRrFfMacSchedulerTestCase(3, 20000, 137000, 41000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaRrFfMacSchedulerTestCase(6, 20000, 67000, 22000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaRrFfMacSchedulerTestCase(9, 20000, 32000, 16000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaRrFfMacSchedulerTestCase(12, 20000, 32000, 12000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaRrFfMacSchedulerTestCase(15, 20000, 25600, 9600, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec // UPLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec - AddTestCase(new LenaRrFfMacSchedulerTestCase(1, 100000, 0, 0, errorModel), TestCase::QUICK); + AddTestCase(new LenaRrFfMacSchedulerTestCase(1, 100000, 0, 0, errorModel), + TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/lte-test-secondary-cell-handover.cc b/src/lte/test/lte-test-secondary-cell-handover.cc index 48574b2de..7bcef1599 100644 --- a/src/lte/test/lte-test-secondary-cell-handover.cc +++ b/src/lte/test/lte-test-secondary-cell-handover.cc @@ -207,8 +207,8 @@ class LteSecondaryCellHandoverTestSuite : public TestSuite LteSecondaryCellHandoverTestSuite::LteSecondaryCellHandoverTestSuite() : TestSuite{"lte-secondary-cell-handover", SYSTEM} { - AddTestCase(new LteSecondaryCellHandoverTestCase("Ideal RRC", true), TestCase::QUICK); - AddTestCase(new LteSecondaryCellHandoverTestCase("Real RRC", false), TestCase::QUICK); + 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 c60d05760..e4d15435c 100644 --- a/src/lte/test/lte-test-secondary-cell-selection.cc +++ b/src/lte/test/lte-test-secondary-cell-selection.cc @@ -54,16 +54,16 @@ LteSecondaryCellSelectionTestSuite::LteSecondaryCellSelectionTestSuite() // REAL RRC PROTOCOL, either 2 or 4 UEs connecting to 2 or 4 component carriers AddTestCase(new LteSecondaryCellSelectionTestCase("EPC, real RRC, RngRun=1", false, 1U, 2), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteSecondaryCellSelectionTestCase("EPC, real RRC, RngRun=1", false, 1U, 4), - TestCase::QUICK); + TestCase::Duration::QUICK); // IDEAL RRC PROTOCOL, either 2 or 4 UEs connecting to 2 or 4 component carriers AddTestCase(new LteSecondaryCellSelectionTestCase("EPC, ideal RRC, RngRun=1", true, 1U, 2), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteSecondaryCellSelectionTestCase("EPC, ideal RRC, RngRun=1", true, 1U, 4), - TestCase::QUICK); + TestCase::Duration::QUICK); } // end of LteSecondaryCellSelectionTestSuite::LteSecondaryCellSelectionTestSuite () diff --git a/src/lte/test/lte-test-spectrum-value-helper.cc b/src/lte/test/lte-test-spectrum-value-helper.cc index 4e8c04e40..25cf84fe4 100644 --- a/src/lte/test/lte-test-spectrum-value-helper.cc +++ b/src/lte/test/lte-test-spectrum-value-helper.cc @@ -240,7 +240,8 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() fc2160nrb6[3] = 2.160090000000e+09; fc2160nrb6[4] = 2.160270000000e+09; fc2160nrb6[5] = 2.160450000000e+09; - AddTestCase(new LteSpectrumModelTestCase("fc2160nrb6", 500, 6, fc2160nrb6), TestCase::QUICK); + AddTestCase(new LteSpectrumModelTestCase("fc2160nrb6", 500, 6, fc2160nrb6), + TestCase::Duration::QUICK); std::vector fc2160nrb15(15); fc2160nrb15[0] = 2.158740000000e+09; @@ -258,7 +259,8 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() fc2160nrb15[12] = 2.160900000000e+09; fc2160nrb15[13] = 2.161080000000e+09; fc2160nrb15[14] = 2.161260000000e+09; - AddTestCase(new LteSpectrumModelTestCase("fc2160nrb15", 500, 15, fc2160nrb15), TestCase::QUICK); + AddTestCase(new LteSpectrumModelTestCase("fc2160nrb15", 500, 15, fc2160nrb15), + TestCase::Duration::QUICK); std::vector fc2160nrb25(25); fc2160nrb25[0] = 2.157840000000e+09; @@ -286,7 +288,8 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() fc2160nrb25[22] = 2.161800000000e+09; fc2160nrb25[23] = 2.161980000000e+09; fc2160nrb25[24] = 2.162160000000e+09; - AddTestCase(new LteSpectrumModelTestCase("fc2160nrb25", 500, 25, fc2160nrb25), TestCase::QUICK); + AddTestCase(new LteSpectrumModelTestCase("fc2160nrb25", 500, 25, fc2160nrb25), + TestCase::Duration::QUICK); std::vector fc2160nrb50(50); fc2160nrb50[0] = 2.155590000000e+09; @@ -339,7 +342,8 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() fc2160nrb50[47] = 2.164050000000e+09; fc2160nrb50[48] = 2.164230000000e+09; fc2160nrb50[49] = 2.164410000000e+09; - AddTestCase(new LteSpectrumModelTestCase("fc2160nrb50", 500, 50, fc2160nrb50), TestCase::QUICK); + AddTestCase(new LteSpectrumModelTestCase("fc2160nrb50", 500, 50, fc2160nrb50), + TestCase::Duration::QUICK); std::vector fc2160nrb75(75); fc2160nrb75[0] = 2.153340000000e+09; @@ -417,7 +421,8 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() fc2160nrb75[72] = 2.166300000000e+09; fc2160nrb75[73] = 2.166480000000e+09; fc2160nrb75[74] = 2.166660000000e+09; - AddTestCase(new LteSpectrumModelTestCase("fc2160nrb75", 500, 75, fc2160nrb75), TestCase::QUICK); + AddTestCase(new LteSpectrumModelTestCase("fc2160nrb75", 500, 75, fc2160nrb75), + TestCase::Duration::QUICK); std::vector fc2160nrb100(100); fc2160nrb100[0] = 2.151090000000e+09; @@ -521,7 +526,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() fc2160nrb100[98] = 2.168730000000e+09; fc2160nrb100[99] = 2.168910000000e+09; AddTestCase(new LteSpectrumModelTestCase("fc2160nrb100", 500, 100, fc2160nrb100), - TestCase::QUICK); + TestCase::Duration::QUICK); std::vector fc1730nrb6(6); fc1730nrb6[0] = 1.729550000000e+09; @@ -530,7 +535,8 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() fc1730nrb6[3] = 1.730090000000e+09; fc1730nrb6[4] = 1.730270000000e+09; fc1730nrb6[5] = 1.730450000000e+09; - AddTestCase(new LteSpectrumModelTestCase("fc1730nrb6", 19400, 6, fc1730nrb6), TestCase::QUICK); + AddTestCase(new LteSpectrumModelTestCase("fc1730nrb6", 19400, 6, fc1730nrb6), + TestCase::Duration::QUICK); std::vector fc1730nrb15(15); fc1730nrb15[0] = 1.728740000000e+09; @@ -549,7 +555,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() fc1730nrb15[13] = 1.731080000000e+09; fc1730nrb15[14] = 1.731260000000e+09; AddTestCase(new LteSpectrumModelTestCase("fc1730nrb15", 19400, 15, fc1730nrb15), - TestCase::QUICK); + TestCase::Duration::QUICK); std::vector fc1730nrb25(25); fc1730nrb25[0] = 1.727840000000e+09; @@ -578,7 +584,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() fc1730nrb25[23] = 1.731980000000e+09; fc1730nrb25[24] = 1.732160000000e+09; AddTestCase(new LteSpectrumModelTestCase("fc1730nrb25", 19400, 25, fc1730nrb25), - TestCase::QUICK); + TestCase::Duration::QUICK); std::vector fc1730nrb50(50); fc1730nrb50[0] = 1.725590000000e+09; @@ -632,7 +638,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() fc1730nrb50[48] = 1.734230000000e+09; fc1730nrb50[49] = 1.734410000000e+09; AddTestCase(new LteSpectrumModelTestCase("fc1730nrb50", 19400, 50, fc1730nrb50), - TestCase::QUICK); + TestCase::Duration::QUICK); std::vector fc1730nrb75(75); fc1730nrb75[0] = 1.723340000000e+09; @@ -711,7 +717,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() fc1730nrb75[73] = 1.736480000000e+09; fc1730nrb75[74] = 1.736660000000e+09; AddTestCase(new LteSpectrumModelTestCase("fc1730nrb75", 19400, 75, fc1730nrb75), - TestCase::QUICK); + TestCase::Duration::QUICK); std::vector fc1730nrb100(100); fc1730nrb100[0] = 1.721090000000e+09; @@ -815,7 +821,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() fc1730nrb100[98] = 1.738730000000e+09; fc1730nrb100[99] = 1.738910000000e+09; AddTestCase(new LteSpectrumModelTestCase("fc1730nrb100", 19400, 100, fc1730nrb100), - TestCase::QUICK); + TestCase::Duration::QUICK); SpectrumValue nfdB0earfcn500nrb6(LteSpectrumValueHelper::GetSpectrumModel(500, 6)); nfdB0earfcn500nrb6[0] = 4.002000000000e-21; @@ -825,7 +831,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() nfdB0earfcn500nrb6[4] = 4.002000000000e-21; nfdB0earfcn500nrb6[5] = 4.002000000000e-21; AddTestCase(new LteNoisePsdTestCase("nfdB0earfcn500nrb6", 500, 6, 0.000000, nfdB0earfcn500nrb6), - TestCase::QUICK); + TestCase::Duration::QUICK); SpectrumValue nfdB5earfcn500nrb6(LteSpectrumValueHelper::GetSpectrumModel(500, 6)); nfdB5earfcn500nrb6[0] = 1.265543519599e-20; @@ -835,7 +841,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() nfdB5earfcn500nrb6[4] = 1.265543519599e-20; nfdB5earfcn500nrb6[5] = 1.265543519599e-20; AddTestCase(new LteNoisePsdTestCase("nfdB5earfcn500nrb6", 500, 6, 5.000000, nfdB5earfcn500nrb6), - TestCase::QUICK); + TestCase::Duration::QUICK); SpectrumValue nfdB10earfcn500nrb6(LteSpectrumValueHelper::GetSpectrumModel(500, 6)); nfdB10earfcn500nrb6[0] = 4.002000000000e-20; @@ -846,7 +852,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() nfdB10earfcn500nrb6[5] = 4.002000000000e-20; AddTestCase( new LteNoisePsdTestCase("nfdB10earfcn500nrb6", 500, 6, 10.000000, nfdB10earfcn500nrb6), - TestCase::QUICK); + TestCase::Duration::QUICK); SpectrumValue nfdB0earfcn500nrb15(LteSpectrumValueHelper::GetSpectrumModel(500, 15)); nfdB0earfcn500nrb15[0] = 4.002000000000e-21; @@ -866,7 +872,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() nfdB0earfcn500nrb15[14] = 4.002000000000e-21; AddTestCase( new LteNoisePsdTestCase("nfdB0earfcn500nrb15", 500, 15, 0.000000, nfdB0earfcn500nrb15), - TestCase::QUICK); + TestCase::Duration::QUICK); SpectrumValue nfdB5earfcn500nrb15(LteSpectrumValueHelper::GetSpectrumModel(500, 15)); nfdB5earfcn500nrb15[0] = 1.265543519599e-20; @@ -886,7 +892,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() nfdB5earfcn500nrb15[14] = 1.265543519599e-20; AddTestCase( new LteNoisePsdTestCase("nfdB5earfcn500nrb15", 500, 15, 5.000000, nfdB5earfcn500nrb15), - TestCase::QUICK); + TestCase::Duration::QUICK); SpectrumValue nfdB10earfcn500nrb15(LteSpectrumValueHelper::GetSpectrumModel(500, 15)); nfdB10earfcn500nrb15[0] = 4.002000000000e-20; @@ -922,7 +928,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() 10.000000, activeRbs_txpowdB10nrb6run1earfcn500, spectrumValue_txpowdB10nrb6run1earfcn500), - TestCase::QUICK); + TestCase::Duration::QUICK); std::vector activeRbs_txpowdB30nrb6run1earfcn500(1); activeRbs_txpowdB30nrb6run1earfcn500[0] = 5.000000000000e+00; @@ -940,7 +946,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() 30.000000, activeRbs_txpowdB30nrb6run1earfcn500, spectrumValue_txpowdB30nrb6run1earfcn500), - TestCase::QUICK); + TestCase::Duration::QUICK); std::vector activeRbs_txpowdB10nrb25run1earfcn500(8); activeRbs_txpowdB10nrb25run1earfcn500[0] = 1.000000000000e+00; @@ -984,7 +990,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() 10.000000, activeRbs_txpowdB10nrb25run1earfcn500, spectrumValue_txpowdB10nrb25run1earfcn500), - TestCase::QUICK); + TestCase::Duration::QUICK); std::vector activeRbs_txpowdB30nrb25run1earfcn500(13); activeRbs_txpowdB30nrb25run1earfcn500[0] = 0.000000000000e+00; @@ -1033,7 +1039,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() 30.000000, activeRbs_txpowdB30nrb25run1earfcn500, spectrumValue_txpowdB30nrb25run1earfcn500), - TestCase::QUICK); + TestCase::Duration::QUICK); std::vector activeRbs_txpowdB10nrb100run1earfcn500(60); activeRbs_txpowdB10nrb100run1earfcn500[0] = 0.000000000000e+00; @@ -1204,7 +1210,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() 10.000000, activeRbs_txpowdB10nrb100run1earfcn500, spectrumValue_txpowdB10nrb100run1earfcn500), - TestCase::QUICK); + TestCase::Duration::QUICK); std::vector activeRbs_txpowdB30nrb100run1earfcn500(39); activeRbs_txpowdB30nrb100run1earfcn500[0] = 0.000000000000e+00; @@ -1354,7 +1360,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() 30.000000, activeRbs_txpowdB30nrb100run1earfcn500, spectrumValue_txpowdB30nrb100run1earfcn500), - TestCase::QUICK); + TestCase::Duration::QUICK); std::vector activeRbs_txpowdB10nrb6run2earfcn500(3); activeRbs_txpowdB10nrb6run2earfcn500[0] = 1.000000000000e+00; @@ -1374,7 +1380,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() 10.000000, activeRbs_txpowdB10nrb6run2earfcn500, spectrumValue_txpowdB10nrb6run2earfcn500), - TestCase::QUICK); + TestCase::Duration::QUICK); std::vector activeRbs_txpowdB30nrb6run2earfcn500(3); activeRbs_txpowdB30nrb6run2earfcn500[0] = 3.000000000000e+00; @@ -1394,7 +1400,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() 30.000000, activeRbs_txpowdB30nrb6run2earfcn500, spectrumValue_txpowdB30nrb6run2earfcn500), - TestCase::QUICK); + TestCase::Duration::QUICK); std::vector activeRbs_txpowdB10nrb25run2earfcn500(15); activeRbs_txpowdB10nrb25run2earfcn500[0] = 0.000000000000e+00; @@ -1445,7 +1451,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() 10.000000, activeRbs_txpowdB10nrb25run2earfcn500, spectrumValue_txpowdB10nrb25run2earfcn500), - TestCase::QUICK); + TestCase::Duration::QUICK); std::vector activeRbs_txpowdB30nrb25run2earfcn500(13); activeRbs_txpowdB30nrb25run2earfcn500[0] = 0.000000000000e+00; @@ -1494,7 +1500,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() 30.000000, activeRbs_txpowdB30nrb25run2earfcn500, spectrumValue_txpowdB30nrb25run2earfcn500), - TestCase::QUICK); + TestCase::Duration::QUICK); std::vector activeRbs_txpowdB10nrb100run2earfcn500(48); activeRbs_txpowdB10nrb100run2earfcn500[0] = 2.000000000000e+00; @@ -1653,7 +1659,7 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() 10.000000, activeRbs_txpowdB10nrb100run2earfcn500, spectrumValue_txpowdB10nrb100run2earfcn500), - TestCase::QUICK); + TestCase::Duration::QUICK); std::vector activeRbs_txpowdB30nrb100run2earfcn500(52); activeRbs_txpowdB30nrb100run2earfcn500[0] = 0.000000000000e+00; @@ -1816,5 +1822,5 @@ LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() 30.000000, activeRbs_txpowdB30nrb100run2earfcn500, spectrumValue_txpowdB30nrb100run2earfcn500), - TestCase::QUICK); + TestCase::Duration::QUICK); } 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 5bcc4a63a..e13559fac 100644 --- a/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc @@ -78,13 +78,13 @@ LenaTestTdBetFfMacSchedulerSuite::LenaTestTdBetFfMacSchedulerSuite() // after the patch enforcing min 3 PRBs per UE: // 12 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/12 UE/TTI -> 184670 bytes/sec AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(1, 0, 2196000, 2292000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(3, 0, 732000, 749000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(6, 0, 366000, 373000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(12, 0, 183000, 184670, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 4800 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec @@ -98,13 +98,13 @@ LenaTestTdBetFfMacSchedulerSuite::LenaTestTdBetFfMacSchedulerSuite() // after the patch enforcing min 3 PRBs per UE: // 12 users -> 3 PRB at Itbs 13 -> 93 bytes * 8/12 UE/TTI -> 62000 bytes/sec AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(1, 4800, 1383000, 807000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(3, 4800, 461000, 253000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(6, 4800, 230500, 125000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(12, 4800, 115250, 62000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 6000 -> MCS 20 -> Itbs 18 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 18 -> 1191 -> 1191000 byte/sec @@ -117,13 +117,13 @@ LenaTestTdBetFfMacSchedulerSuite::LenaTestTdBetFfMacSchedulerSuite() // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 bytes/sec AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(1, 6000, 1191000, 621000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(3, 6000, 397000, 201000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(6, 6000, 198500, 97000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(12, 6000, 99250, 48667, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 10000 -> MCS 14 -> Itbs 13 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 13 -> 775 -> 775000 byte/sec @@ -137,13 +137,13 @@ LenaTestTdBetFfMacSchedulerSuite::LenaTestTdBetFfMacSchedulerSuite() // after the patch enforcing min 3 PRBs per UE: // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 bytes/sec AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(1, 10000, 775000, 421000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(3, 10000, 258333, 137000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(6, 10000, 129166, 67000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(12, 10000, 64583, 32667, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 20000 -> MCS 8 -> Itbs 8 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 8 -> 421 -> 421000 bytes/sec @@ -157,17 +157,18 @@ LenaTestTdBetFfMacSchedulerSuite::LenaTestTdBetFfMacSchedulerSuite() // after the patch enforcing min 3 PRBs per UE: // 12 users -> 3 PRB at Itbs 2 -> 18 bytes * 8/12 UE/TTI -> 12000 bytes/sec AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(1, 20000, 421000, 137000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(3, 20000, 140333, 41000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(6, 20000, 70166, 22000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(12, 20000, 35083, 12000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec // UPLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec - AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(1, 100000, 0, 0, errorModel), TestCase::QUICK); + AddTestCase(new LenaTdBetFfMacSchedulerTestCase1(1, 100000, 0, 0, errorModel), + TestCase::Duration::QUICK); // Test Case 2: fairness check @@ -191,7 +192,7 @@ LenaTestTdBetFfMacSchedulerSuite::LenaTestTdBetFfMacSchedulerSuite() estThrTdBetUl.push_back(26000); // User 4 estimated TTI throughput from TDBET AddTestCase( new LenaTdBetFfMacSchedulerTestCase2(dist, estAchievableRateDl, estThrTdBetUl, errorModel), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** 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 a8caaa131..4cad3d9c0 100644 --- a/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc @@ -77,13 +77,13 @@ LenaTestTdMtFfMacSchedulerSuite::LenaTestTdMtFfMacSchedulerSuite() // min 3 PRBs per UE: 12 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/12 UE/TTI -> 184670 // bytes/sec AddTestCase(new LenaTdMtFfMacSchedulerTestCase(1, 0, 2196000, 2292000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdMtFfMacSchedulerTestCase(3, 0, 2196000, 749000, errorModel), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LenaTdMtFfMacSchedulerTestCase(6, 0, 2196000, 373000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdMtFfMacSchedulerTestCase(12, 0, 2196000, 184670, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 4800 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec for one UE; 0 bytes/sec for other @@ -96,13 +96,13 @@ LenaTestTdMtFfMacSchedulerSuite::LenaTestTdMtFfMacSchedulerSuite() // min 3 PRBs per UE: 12 users -> 3 PRB at Itbs 13 -> 93 bytes * 8/12 UE/TTI -> 62000 // bytes/sec AddTestCase(new LenaTdMtFfMacSchedulerTestCase(1, 4800, 1383000, 807000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdMtFfMacSchedulerTestCase(3, 4800, 1383000, 253000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdMtFfMacSchedulerTestCase(6, 4800, 1383000, 125000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdMtFfMacSchedulerTestCase(12, 4800, 1383000, 62000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 6000 -> MCS 20 -> Itbs 18 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 18 -> 1191 -> 1191000 byte/sec for one UE; 0 bytes/sec for other UEs @@ -116,13 +116,13 @@ LenaTestTdMtFfMacSchedulerSuite::LenaTestTdMtFfMacSchedulerSuite() // after the patch enforcing min 3 PRBs per UE: // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 bytes/sec AddTestCase(new LenaTdMtFfMacSchedulerTestCase(1, 6000, 1191000, 621000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdMtFfMacSchedulerTestCase(3, 6000, 1191000, 201000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdMtFfMacSchedulerTestCase(6, 6000, 1191000, 97000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdMtFfMacSchedulerTestCase(12, 6000, 1191000, 48667, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 10000 -> MCS 14 -> Itbs 13 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 13 -> 775 -> 775000 byte/sec for one UE; 0 bytes/sec for other UEs @@ -136,13 +136,13 @@ LenaTestTdMtFfMacSchedulerSuite::LenaTestTdMtFfMacSchedulerSuite() // after the patch enforcing min 3 PRBs per UE: // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 bytes/sec AddTestCase(new LenaTdMtFfMacSchedulerTestCase(1, 10000, 775000, 437000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdMtFfMacSchedulerTestCase(3, 10000, 775000, 137000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdMtFfMacSchedulerTestCase(6, 10000, 775000, 67000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdMtFfMacSchedulerTestCase(12, 10000, 775000, 32667, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DONWLINK - DISTANCE 20000 -> MCS 8 -> Itbs 8 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 8 -> 421 -> 421000 bytes/sec for one UE; 0 bytes/sec for other UEs @@ -156,17 +156,18 @@ LenaTestTdMtFfMacSchedulerSuite::LenaTestTdMtFfMacSchedulerSuite() // after the patch enforcing min 3 PRBs per UE: // 12 users -> 3 PRB at Itbs 2 -> 26 bytes * 8/12 UE/TTI -> 12000 bytes/sec AddTestCase(new LenaTdMtFfMacSchedulerTestCase(1, 20000, 421000, 137000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdMtFfMacSchedulerTestCase(3, 20000, 421000, 41000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdMtFfMacSchedulerTestCase(6, 20000, 421000, 22000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdMtFfMacSchedulerTestCase(12, 20000, 421000, 12000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec // UPLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec - AddTestCase(new LenaTdMtFfMacSchedulerTestCase(1, 100000, 0, 0, errorModel), TestCase::QUICK); + AddTestCase(new LenaTdMtFfMacSchedulerTestCase(1, 100000, 0, 0, errorModel), + TestCase::Duration::QUICK); } /** 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 01450c96c..1dea8ab33 100644 --- a/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc @@ -93,11 +93,11 @@ LenaTestTdTbfqFfMacSchedulerSuite::LenaTestTdTbfqFfMacSchedulerSuite() // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 > 232000 -> throughput = 232000 bytes/sec // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 < 232000 -> throughput = 185000 bytes/sec AddTestCase(new LenaTdTbfqFfMacSchedulerTestCase1(1, 0, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdTbfqFfMacSchedulerTestCase1(3, 0, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdTbfqFfMacSchedulerTestCase1(6, 0, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,183000,185000,200,1,errorModel));// // simulation time = 1.5, otherwise, ul test will fail @@ -119,11 +119,11 @@ LenaTestTdTbfqFfMacSchedulerSuite::LenaTestTdTbfqFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 13 -> 93 bytes * 8/12 UE/TTI -> 62000 < 232000 -> throughput = // 62000 bytes/sec AddTestCase(new LenaTdTbfqFfMacSchedulerTestCase1(1, 4800, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdTbfqFfMacSchedulerTestCase1(3, 4800, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdTbfqFfMacSchedulerTestCase1(6, 4800, 230500, 125000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,4800,115250,62000,200,1,errorModel)); // // simulation time = 1.5, otherwise, ul test will fail @@ -146,11 +146,11 @@ LenaTestTdTbfqFfMacSchedulerSuite::LenaTestTdTbfqFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 < 232000 -> throughput = // 48667 bytes/sec AddTestCase(new LenaTdTbfqFfMacSchedulerTestCase1(1, 6000, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdTbfqFfMacSchedulerTestCase1(3, 6000, 232000, 201000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdTbfqFfMacSchedulerTestCase1(6, 6000, 198500, 97000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,6000,99250,48667,200,1, errorModel)); // // simulation time = 1.5, otherwise, ul test will fail @@ -172,11 +172,11 @@ LenaTestTdTbfqFfMacSchedulerSuite::LenaTestTdTbfqFfMacSchedulerSuite() // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 < 232000 -> throughput = 32667 // bytes/sec AddTestCase(new LenaTdTbfqFfMacSchedulerTestCase1(1, 10000, 232000, 232000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdTbfqFfMacSchedulerTestCase1(3, 10000, 232000, 137000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTdTbfqFfMacSchedulerTestCase1(6, 10000, 129166, 67000, 200, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 // (12,10000,64583,32667,200,1,errorModel));// simulation time = 1.5, otherwise, ul test will // fail @@ -184,7 +184,7 @@ LenaTestTdTbfqFfMacSchedulerSuite::LenaTestTdTbfqFfMacSchedulerSuite() // DOWNLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec // UPLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec AddTestCase(new LenaTdTbfqFfMacSchedulerTestCase1(1, 100000, 0, 0, 200, 1, errorModel), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test Case 2: homogeneous flow test in TDTBFQ (different distance) // Traffic1 info @@ -210,7 +210,7 @@ LenaTestTdTbfqFfMacSchedulerSuite::LenaTestTdTbfqFfMacSchedulerSuite() estThrTdTbfqDl1.push_back(132000); // User 3 estimated TTI throughput from TDTBFQ AddTestCase( new LenaTdTbfqFfMacSchedulerTestCase2(dist1, estThrTdTbfqDl1, packetSize1, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // Traffic2 info // UDP traffic: payload size = 300 bytes, interval = 1 ms @@ -236,7 +236,7 @@ LenaTestTdTbfqFfMacSchedulerSuite::LenaTestTdTbfqFfMacSchedulerSuite() estThrTdTbfqDl2.push_back(302500); // User 3 estimated TTI throughput from TDTBFQ AddTestCase( new LenaTdTbfqFfMacSchedulerTestCase2(dist2, estThrTdTbfqDl2, packetSize2, 1, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // Test Case 3: heterogeneous flow test in TDTBFQ // UDP traffic: payload size = [100,200,300] bytes, interval = 1 ms @@ -259,7 +259,7 @@ LenaTestTdTbfqFfMacSchedulerSuite::LenaTestTdTbfqFfMacSchedulerSuite() estThrTdTbfqDl3.push_back(332000); // User 2 estimated TTI throughput from TDTBFQ AddTestCase( new LenaTdTbfqFfMacSchedulerTestCase2(dist3, estThrTdTbfqDl3, packetSize3, 1, errorModel), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** 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 905539129..cb441314b 100644 --- a/src/lte/test/lte-test-tta-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-tta-ff-mac-scheduler.cc @@ -77,15 +77,15 @@ LenaTestTtaFfMacSchedulerSuite::LenaTestTtaFfMacSchedulerSuite() // min 3 PRBs per UE: 12 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/12 UE/TTI -> 184670 // bytes/sec AddTestCase(new LenaTtaFfMacSchedulerTestCase(1, 0, 2196000, 2292000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTtaFfMacSchedulerTestCase(3, 0, 2196000, 749000, errorModel), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LenaTtaFfMacSchedulerTestCase(6, 0, 2196000, 373000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTtaFfMacSchedulerTestCase(12, 0, 2196000, 184670, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTtaFfMacSchedulerTestCase(15, 0, 2196000, 147730, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 4800 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 15 -> 1383 -> 1383000 bytes/sec for one UE; 0 bytes/sec for other @@ -98,13 +98,13 @@ LenaTestTtaFfMacSchedulerSuite::LenaTestTtaFfMacSchedulerSuite() // min 3 PRBs per UE: 12 users -> 3 PRB at Itbs 13 -> 93 bytes * 8/12 UE/TTI -> 62000 // bytes/sec AddTestCase(new LenaTtaFfMacSchedulerTestCase(1, 4800, 1383000, 807000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTtaFfMacSchedulerTestCase(3, 4800, 1383000, 253000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTtaFfMacSchedulerTestCase(6, 4800, 1383000, 125000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTtaFfMacSchedulerTestCase(12, 4800, 1383000, 62000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 6000 -> MCS 20 -> Itbs 18 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 15 -> 1191 -> 1191000 bytes/sec for one UE; 0 bytes/sec for other @@ -116,13 +116,13 @@ LenaTestTtaFfMacSchedulerSuite::LenaTestTtaFfMacSchedulerSuite() // bytes/sec 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec after the patch enforcing min // 3 PRBs per UE: 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 bytes/sec AddTestCase(new LenaTtaFfMacSchedulerTestCase(1, 6000, 1191000, 621000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTtaFfMacSchedulerTestCase(3, 6000, 1191000, 201000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTtaFfMacSchedulerTestCase(6, 6000, 1191000, 97000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTtaFfMacSchedulerTestCase(12, 6000, 1191000, 48667, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 10000 -> MCS 14 -> Itbs 13 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 8 -> 775 -> 775000 bytes/sec for one UE; 0 bytes/sec for other UEs @@ -136,13 +136,13 @@ LenaTestTtaFfMacSchedulerSuite::LenaTestTtaFfMacSchedulerSuite() // after the patch enforcing min 3 PRBs per UE: // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 bytes/sec AddTestCase(new LenaTtaFfMacSchedulerTestCase(1, 10000, 775000, 437000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTtaFfMacSchedulerTestCase(3, 10000, 775000, 137000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTtaFfMacSchedulerTestCase(6, 10000, 775000, 67000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTtaFfMacSchedulerTestCase(12, 10000, 775000, 32667, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DONWLINK - DISTANCE 20000 -> MCS 8 -> Itbs 8 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 8 -> 421 -> 421000 bytes/sec for one UE; 0 bytes/sec for other UEs @@ -156,17 +156,18 @@ LenaTestTtaFfMacSchedulerSuite::LenaTestTtaFfMacSchedulerSuite() // after the patch enforcing min 3 PRBs per UE: // 12 users -> 3 PRB at Itbs 2 -> 26 bytes * 8/12 UE/TTI -> 12000 bytes/sec AddTestCase(new LenaTtaFfMacSchedulerTestCase(1, 20000, 421000, 137000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTtaFfMacSchedulerTestCase(3, 20000, 421000, 41000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTtaFfMacSchedulerTestCase(6, 20000, 421000, 22000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LenaTtaFfMacSchedulerTestCase(12, 20000, 421000, 12000, errorModel), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // DOWNLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec // UPLINK - DISTANCE 100000 -> CQI == 0 -> out of range -> 0 bytes/sec - AddTestCase(new LenaTtaFfMacSchedulerTestCase(1, 100000, 0, 0, errorModel), TestCase::QUICK); + AddTestCase(new LenaTtaFfMacSchedulerTestCase(1, 100000, 0, 0, errorModel), + TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/lte-test-ue-measurements.cc b/src/lte/test/lte-test-ue-measurements.cc index 530454f14..8f1df3346 100644 --- a/src/lte/test/lte-test-ue-measurements.cc +++ b/src/lte/test/lte-test-ue-measurements.cc @@ -93,7 +93,7 @@ LteUeMeasurementsTestSuite::LteUeMeasurementsTestSuite() -113.739702, -3.010305, -63.010305), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteUeMeasurementsTestCase("d1=20, d2=10000", 20.000000, 10000.000000, @@ -101,7 +101,7 @@ LteUeMeasurementsTestSuite::LteUeMeasurementsTestSuite() -113.739702, -3.010319, -56.989719), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteUeMeasurementsTestCase("d1=50, d2=10000", 50.000000, 10000.000000, @@ -109,7 +109,7 @@ LteUeMeasurementsTestSuite::LteUeMeasurementsTestSuite() -113.739702, -3.010421, -49.031021), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteUeMeasurementsTestCase("d1=100, d2=10000", 100.000000, 10000.000000, @@ -117,7 +117,7 @@ LteUeMeasurementsTestSuite::LteUeMeasurementsTestSuite() -113.739702, -3.010783, -43.010783), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteUeMeasurementsTestCase("d1=200, d2=10000", 200.000000, 10000.000000, @@ -125,7 +125,7 @@ LteUeMeasurementsTestSuite::LteUeMeasurementsTestSuite() -113.739702, -3.012232, -36.991632), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteUeMeasurementsTestCase("d1=100, d2=10000", 100.000000, 10000.000000, @@ -133,7 +133,7 @@ LteUeMeasurementsTestSuite::LteUeMeasurementsTestSuite() -113.739702, -3.010783, -43.010783), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteUeMeasurementsTestCase("d1=200, d2=10000", 200.000000, 10000.000000, @@ -141,7 +141,7 @@ LteUeMeasurementsTestSuite::LteUeMeasurementsTestSuite() -113.739702, -3.012232, -36.991632), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteUeMeasurementsTestCase("d1=500, d2=10000", 500.000000, 10000.000000, @@ -149,7 +149,7 @@ LteUeMeasurementsTestSuite::LteUeMeasurementsTestSuite() -113.739702, -3.022359, -29.042959), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteUeMeasurementsTestCase("d1=1000, d2=10000", 1000.000000, 10000.000000, @@ -157,7 +157,7 @@ LteUeMeasurementsTestSuite::LteUeMeasurementsTestSuite() -113.739702, -3.058336, -23.058336), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteUeMeasurementsTestCase("d1=2000, d2=10000", 2000.000000, 10000.000000, @@ -165,7 +165,7 @@ LteUeMeasurementsTestSuite::LteUeMeasurementsTestSuite() -113.739702, -3.199337, -17.178738), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteUeMeasurementsTestCase("d1=5000, d2=10000", 5000.000000, 10000.000000, @@ -173,7 +173,7 @@ LteUeMeasurementsTestSuite::LteUeMeasurementsTestSuite() -113.739702, -4.075793, -10.096393), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteUeMeasurementsTestCase("d1=10000, d2=10000", 10000.000000, 10000.000000, @@ -181,7 +181,7 @@ LteUeMeasurementsTestSuite::LteUeMeasurementsTestSuite() -113.739702, -6.257687, -6.257687), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteUeMeasurementsTestCase("d1=20000, d2=10000", 20000.000000, 10000.000000, @@ -189,7 +189,7 @@ LteUeMeasurementsTestSuite::LteUeMeasurementsTestSuite() -113.739702, -10.373365, -4.352765), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteUeMeasurementsTestCase("d1=50000, d2=10000", 50000.000000, 10000.000000, @@ -197,7 +197,7 @@ LteUeMeasurementsTestSuite::LteUeMeasurementsTestSuite() -113.739702, -17.605046, -3.625645), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteUeMeasurementsTestCase("d1=100000, d2=10000", 100000.000000, 10000.000000, @@ -205,7 +205,7 @@ LteUeMeasurementsTestSuite::LteUeMeasurementsTestSuite() -113.739702, -23.511071, -3.511071), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteUeMeasurementsTestCase("d1=200000, d2=10000", 200000.000000, 10000.000000, @@ -213,7 +213,7 @@ LteUeMeasurementsTestSuite::LteUeMeasurementsTestSuite() -113.739702, -29.502549, -3.481949), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteUeMeasurementsTestCase("d1=500000, d2=10000", 500000.000000, 10000.000000, @@ -221,7 +221,7 @@ LteUeMeasurementsTestSuite::LteUeMeasurementsTestSuite() -113.739702, -37.453160, -3.473760), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteUeMeasurementsTestCase("d1=1000000, d2=10000", 1000000.000000, 10000.000000, @@ -229,7 +229,7 @@ LteUeMeasurementsTestSuite::LteUeMeasurementsTestSuite() -113.739702, -43.472589, -3.472589), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); } /** @@ -478,7 +478,7 @@ LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // With normal threshold config.threshold1.range = 54; @@ -491,7 +491,7 @@ LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // With short time-to-trigger config.timeToTrigger = 64; @@ -504,7 +504,7 @@ LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1() config, expectedTime, expectedRsrp), - TestCase::QUICK); + TestCase::Duration::QUICK); // With long time-to-trigger config.timeToTrigger = 128; @@ -517,7 +517,7 @@ LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // With super time-to-trigger config.timeToTrigger = 256; @@ -530,7 +530,7 @@ LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // With hysteresis config.hysteresis = 8; @@ -544,7 +544,7 @@ LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1() config, expectedTime, expectedRsrp), - TestCase::QUICK); + TestCase::Duration::QUICK); // With very high threshold config.threshold1.range = 97; @@ -556,7 +556,7 @@ LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1() config, expectedTime, expectedRsrp), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); // === Event A2 (serving cell becomes worse than threshold) === @@ -570,7 +570,7 @@ LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1() config, expectedTime, expectedRsrp), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); // With normal threshold config.threshold1.range = 54; @@ -583,7 +583,7 @@ LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1() config, expectedTime, expectedRsrp), - TestCase::QUICK); + TestCase::Duration::QUICK); // With short time-to-trigger config.timeToTrigger = 64; @@ -596,7 +596,7 @@ LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // With long time-to-trigger config.timeToTrigger = 128; @@ -609,7 +609,7 @@ LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1() config, expectedTime, expectedRsrp), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); // With super time-to-trigger config.timeToTrigger = 256; @@ -622,7 +622,7 @@ LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1() config, expectedTime, expectedRsrp), - TestCase::QUICK); + TestCase::Duration::QUICK); // With hysteresis config.hysteresis = 8; @@ -636,7 +636,7 @@ LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // With very high threshold config.threshold1.range = 97; @@ -652,7 +652,7 @@ LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); /* * Event A3, A4, and A5 are not tested intensively here because they depend on @@ -672,7 +672,7 @@ LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // === Event A4 (neighbour becomes better than threshold) === @@ -682,7 +682,7 @@ LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // === Event A5 (PCell becomes worse than absolute threshold1 AND neighbour becomes better than // another absolute threshold2) === @@ -693,7 +693,7 @@ LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); } // end of LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1 @@ -985,7 +985,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // With normal threshold config.threshold1.range = 58; @@ -998,7 +998,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); // With hysteresis config.hysteresis = 6; @@ -1011,7 +1011,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // With very high threshold config.threshold1.range = 97; @@ -1023,7 +1023,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); // === Event A2 (serving cell becomes worse than threshold) === @@ -1037,7 +1037,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); // With normal threshold config.threshold1.range = 58; @@ -1050,7 +1050,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); // With hysteresis config.hysteresis = 6; @@ -1063,7 +1063,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // With very high threshold config.threshold1.range = 97; @@ -1077,7 +1077,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); // === Event A3 (neighbour becomes offset better than PCell) === @@ -1094,7 +1094,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::QUICK); + TestCase::Duration::QUICK); // With zero offset config.a3Offset = 0; @@ -1107,7 +1107,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // With short time-to-trigger config.timeToTrigger = 160; @@ -1120,7 +1120,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // With super time-to-trigger config.timeToTrigger = 320; @@ -1133,7 +1133,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::QUICK); + TestCase::Duration::QUICK); // With hysteresis and reportOnLeave config.hysteresis = 6; @@ -1148,7 +1148,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::QUICK); + TestCase::Duration::QUICK); // With negative offset config.a3Offset = -7; @@ -1163,7 +1163,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // === Event A4 (neighbour becomes better than threshold) === @@ -1180,7 +1180,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::QUICK); + TestCase::Duration::QUICK); // With normal threshold config.threshold1.range = 58; @@ -1193,7 +1193,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // With short time-to-trigger config.timeToTrigger = 160; @@ -1206,7 +1206,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::QUICK); + TestCase::Duration::QUICK); // With super time-to-trigger config.timeToTrigger = 320; @@ -1219,7 +1219,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); // With hysteresis config.hysteresis = 6; @@ -1233,7 +1233,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::QUICK); + TestCase::Duration::QUICK); // With very high threshold config.threshold1.range = 97; @@ -1245,7 +1245,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); // === Event A5 (PCell becomes worse than absolute threshold1 AND neighbour becomes better than // another absolute threshold2) === @@ -1261,7 +1261,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // With low-normal threshold config.threshold2.range = 58; @@ -1270,7 +1270,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); // With low-high threshold config.threshold2.range = 97; @@ -1279,7 +1279,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); // With normal-low threshold config.threshold1.range = 58; @@ -1293,7 +1293,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // With normal-normal threshold config.threshold2.range = 58; @@ -1306,7 +1306,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // With short time-to-trigger config.timeToTrigger = 160; @@ -1319,7 +1319,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); // With super time-to-trigger config.timeToTrigger = 320; @@ -1332,7 +1332,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::QUICK); + TestCase::Duration::QUICK); // With hysteresis config.hysteresis = 6; @@ -1346,7 +1346,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::QUICK); + TestCase::Duration::QUICK); // With normal-high threshold config.threshold2.range = 97; @@ -1358,7 +1358,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); // With high-low threshold config.threshold1.range = 97; @@ -1372,7 +1372,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // With high-normal threshold config.threshold2.range = 58; @@ -1385,7 +1385,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); // With high-high threshold config.threshold2.range = 97; @@ -1396,7 +1396,7 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2() config, expectedTime, expectedRsrp), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); } // end of LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2 @@ -1724,7 +1724,7 @@ LteUeMeasurementsPiecewiseTestSuite3::LteUeMeasurementsPiecewiseTestSuite3() AddTestCase(new LteUeMeasurementsPiecewiseTestCase3("Piecewise test case 3 - Event A4", config, expectedTime), - TestCase::QUICK); + TestCase::Duration::QUICK); } // end of LteUeMeasurementsPiecewiseTestSuite3::LteUeMeasurementsPiecewiseTestSuite3 /** @@ -2001,7 +2001,7 @@ LteUeMeasurementsHandoverTestSuite::LteUeMeasurementsHandoverTestSuite() expectedTime, expectedRsrp, Seconds(2)), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); // increasing report interval sourceConfigList.front().reportInterval = LteRrcSap::ReportConfigEutra::MS120; @@ -2017,7 +2017,7 @@ LteUeMeasurementsHandoverTestSuite::LteUeMeasurementsHandoverTestSuite() expectedTime, expectedRsrp, Seconds(2)), - TestCase::QUICK); + TestCase::Duration::QUICK); // === Event difference === @@ -2043,7 +2043,7 @@ LteUeMeasurementsHandoverTestSuite::LteUeMeasurementsHandoverTestSuite() expectedTime, expectedRsrp, Seconds(2)), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // Event A2 to Event A1 sourceConfigList.front().eventId = LteRrcSap::ReportConfigEutra::EVENT_A2; @@ -2056,7 +2056,7 @@ LteUeMeasurementsHandoverTestSuite::LteUeMeasurementsHandoverTestSuite() expectedTime, expectedRsrp, Seconds(2)), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); // Event A3 to Event A4 sourceConfigList.front().eventId = LteRrcSap::ReportConfigEutra::EVENT_A3; @@ -2071,7 +2071,7 @@ LteUeMeasurementsHandoverTestSuite::LteUeMeasurementsHandoverTestSuite() expectedTime, expectedRsrp, Seconds(2)), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); // Event A4 to Event A3 sourceConfigList.front().eventId = LteRrcSap::ReportConfigEutra::EVENT_A4; @@ -2086,7 +2086,7 @@ LteUeMeasurementsHandoverTestSuite::LteUeMeasurementsHandoverTestSuite() expectedTime, expectedRsrp, Seconds(2)), - TestCase::QUICK); + TestCase::Duration::QUICK); // Event A2 to Event A3 sourceConfigList.front().eventId = LteRrcSap::ReportConfigEutra::EVENT_A2; @@ -2101,7 +2101,7 @@ LteUeMeasurementsHandoverTestSuite::LteUeMeasurementsHandoverTestSuite() expectedTime, expectedRsrp, Seconds(2)), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // Event A3 to Event A2 sourceConfigList.front().eventId = LteRrcSap::ReportConfigEutra::EVENT_A3; @@ -2116,7 +2116,7 @@ LteUeMeasurementsHandoverTestSuite::LteUeMeasurementsHandoverTestSuite() expectedTime, expectedRsrp, Seconds(2)), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); // Event A4 to Event A5 sourceConfigList.front().eventId = LteRrcSap::ReportConfigEutra::EVENT_A4; @@ -2131,7 +2131,7 @@ LteUeMeasurementsHandoverTestSuite::LteUeMeasurementsHandoverTestSuite() expectedTime, expectedRsrp, Seconds(2)), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); // Event A5 to Event A4 sourceConfigList.front().eventId = LteRrcSap::ReportConfigEutra::EVENT_A5; @@ -2146,7 +2146,7 @@ LteUeMeasurementsHandoverTestSuite::LteUeMeasurementsHandoverTestSuite() expectedTime, expectedRsrp, Seconds(2)), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // === Threshold/offset difference === @@ -2167,7 +2167,7 @@ LteUeMeasurementsHandoverTestSuite::LteUeMeasurementsHandoverTestSuite() expectedTime, expectedRsrp, Seconds(2)), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // Event A2 sourceConfigList.front().eventId = LteRrcSap::ReportConfigEutra::EVENT_A2; @@ -2183,7 +2183,7 @@ LteUeMeasurementsHandoverTestSuite::LteUeMeasurementsHandoverTestSuite() expectedTime, expectedRsrp, Seconds(2)), - TestCase::QUICK); + TestCase::Duration::QUICK); // Event A3 sourceConfigList.front().eventId = LteRrcSap::ReportConfigEutra::EVENT_A3; @@ -2201,7 +2201,7 @@ LteUeMeasurementsHandoverTestSuite::LteUeMeasurementsHandoverTestSuite() expectedTime, expectedRsrp, Seconds(2)), - TestCase::QUICK); + TestCase::Duration::QUICK); // Event A4 sourceConfigList.front().eventId = LteRrcSap::ReportConfigEutra::EVENT_A4; @@ -2217,7 +2217,7 @@ LteUeMeasurementsHandoverTestSuite::LteUeMeasurementsHandoverTestSuite() expectedTime, expectedRsrp, Seconds(2)), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // Event A5 sourceConfigList.front().eventId = LteRrcSap::ReportConfigEutra::EVENT_A5; @@ -2233,7 +2233,7 @@ LteUeMeasurementsHandoverTestSuite::LteUeMeasurementsHandoverTestSuite() expectedTime, expectedRsrp, Seconds(2)), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // === Time-to-trigger (TTT) difference === @@ -2259,7 +2259,7 @@ LteUeMeasurementsHandoverTestSuite::LteUeMeasurementsHandoverTestSuite() expectedTime, expectedRsrp, Seconds(2)), - TestCase::QUICK); + TestCase::Duration::QUICK); // decreasing time-to-trigger (longer duration) sourceConfigList.front().timeToTrigger = 1024; @@ -2274,7 +2274,7 @@ LteUeMeasurementsHandoverTestSuite::LteUeMeasurementsHandoverTestSuite() expectedTime, expectedRsrp, Seconds(4.2)), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); } // end of LteUeMeasurementsHandoverTestSuite::LteUeMeasurementsHandoverTestSuite diff --git a/src/lte/test/lte-test-uplink-power-control.cc b/src/lte/test/lte-test-uplink-power-control.cc index d18f3d985..ce358232e 100644 --- a/src/lte/test/lte-test-uplink-power-control.cc +++ b/src/lte/test/lte-test-uplink-power-control.cc @@ -59,13 +59,14 @@ LteUplinkPowerControlTestSuite::LteUplinkPowerControlTestSuite() // LogComponentEnable ("LteUplinkPowerControlTest", logLevel); NS_LOG_INFO("Creating LteUplinkPowerControlTestSuite"); - AddTestCase(new LteUplinkOpenLoopPowerControlTestCase("OpenLoopTest1"), TestCase::QUICK); + AddTestCase(new LteUplinkOpenLoopPowerControlTestCase("OpenLoopTest1"), + TestCase::Duration::QUICK); AddTestCase( new LteUplinkClosedLoopPowerControlAbsoluteModeTestCase("ClosedLoopAbsoluteModeTest1"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteUplinkClosedLoopPowerControlAccumulatedModeTestCase( "ClosedLoopAccumulatedModeTest1"), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/lte-test-uplink-sinr.cc b/src/lte/test/lte-test-uplink-sinr.cc index 469317f38..b93ed0195 100644 --- a/src/lte/test/lte-test-uplink-sinr.cc +++ b/src/lte/test/lte-test-uplink-sinr.cc @@ -85,13 +85,13 @@ LteUplinkSinrTestSuite::LteUplinkSinrTestSuite() rxPsd2, theoreticalSinr1, "sdBm = [-46 -inf] and [-inf -48]"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteUplinkSrsSinrTestCase(rxPsd1, rxPsd2, theoreticalSinr1, "sdBm = [-46 -inf] and [-inf -48]"), - TestCase::QUICK); + TestCase::Duration::QUICK); /** * TX signals #2: Power Spectral Density of the signals of interest = [-63 -inf] and [-inf -61] @@ -113,13 +113,13 @@ LteUplinkSinrTestSuite::LteUplinkSinrTestSuite() rxPsd4, theoreticalSinr2, "sdBm = [-63 -inf] and [-inf -61]"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteUplinkSrsSinrTestCase(rxPsd3, rxPsd4, theoreticalSinr2, "sdBm = [-63 -inf] and [-inf -61]"), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/test-asn1-encoding.cc b/src/lte/test/test-asn1-encoding.cc index 37bf3fe8b..cac8bdc0d 100644 --- a/src/lte/test/test-asn1-encoding.cc +++ b/src/lte/test/test-asn1-encoding.cc @@ -1259,17 +1259,17 @@ Asn1EncodingSuite::Asn1EncodingSuite() : TestSuite("test-asn1-encoding", UNIT) { NS_LOG_FUNCTION(this); - AddTestCase(new RrcConnectionRequestTestCase(), TestCase::QUICK); - AddTestCase(new RrcConnectionSetupTestCase(), TestCase::QUICK); - AddTestCase(new RrcConnectionSetupCompleteTestCase(), TestCase::QUICK); - AddTestCase(new RrcConnectionReconfigurationCompleteTestCase(), TestCase::QUICK); - AddTestCase(new RrcConnectionReconfigurationTestCase(), TestCase::QUICK); - AddTestCase(new HandoverPreparationInfoTestCase(), TestCase::QUICK); - AddTestCase(new RrcConnectionReestablishmentRequestTestCase(), TestCase::QUICK); - AddTestCase(new RrcConnectionReestablishmentTestCase(), TestCase::QUICK); - AddTestCase(new RrcConnectionReestablishmentCompleteTestCase(), TestCase::QUICK); - AddTestCase(new RrcConnectionRejectTestCase(), TestCase::QUICK); - AddTestCase(new MeasurementReportTestCase(), TestCase::QUICK); + AddTestCase(new RrcConnectionRequestTestCase(), TestCase::Duration::QUICK); + AddTestCase(new RrcConnectionSetupTestCase(), TestCase::Duration::QUICK); + AddTestCase(new RrcConnectionSetupCompleteTestCase(), TestCase::Duration::QUICK); + AddTestCase(new RrcConnectionReconfigurationCompleteTestCase(), TestCase::Duration::QUICK); + AddTestCase(new RrcConnectionReconfigurationTestCase(), TestCase::Duration::QUICK); + AddTestCase(new HandoverPreparationInfoTestCase(), TestCase::Duration::QUICK); + AddTestCase(new RrcConnectionReestablishmentRequestTestCase(), TestCase::Duration::QUICK); + AddTestCase(new RrcConnectionReestablishmentTestCase(), TestCase::Duration::QUICK); + AddTestCase(new RrcConnectionReestablishmentCompleteTestCase(), TestCase::Duration::QUICK); + AddTestCase(new RrcConnectionRejectTestCase(), TestCase::Duration::QUICK); + AddTestCase(new MeasurementReportTestCase(), TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/test-epc-tft-classifier.cc b/src/lte/test/test-epc-tft-classifier.cc index 0b32a3538..11c4f791c 100644 --- a/src/lte/test/test-epc-tft-classifier.cc +++ b/src/lte/test/test-epc-tft-classifier.cc @@ -315,7 +315,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c1, EpcTft::UPLINK, "2.2.3.4", @@ -325,7 +325,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 5, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c1, EpcTft::UPLINK, "6.2.3.4", @@ -335,7 +335,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 0, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c1, EpcTft::DOWNLINK, "3.3.3.4", @@ -345,7 +345,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c1, EpcTft::DOWNLINK, "3.3.4.4", @@ -355,7 +355,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 0, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c1, EpcTft::UPLINK, "3.3.3.4", @@ -365,7 +365,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 0, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); // test remote port AddTestCase(new EpcTftClassifierTestCase(c1, @@ -377,7 +377,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 2, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c1, EpcTft::UPLINK, "9.1.1.1", @@ -387,7 +387,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 2, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c1, EpcTft::UPLINK, "9.1.1.1", @@ -397,7 +397,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 2, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c1, EpcTft::UPLINK, "9.1.1.1", @@ -407,7 +407,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 0, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c1, EpcTft::DOWNLINK, "9.1.1.1", @@ -417,7 +417,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 0, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c1, EpcTft::DOWNLINK, "9.1.1.1", @@ -427,7 +427,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 0, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c1, EpcTft::DOWNLINK, "9.1.1.1", @@ -437,7 +437,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 0, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); // test local port AddTestCase(new EpcTftClassifierTestCase(c1, @@ -449,7 +449,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 0, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c1, EpcTft::UPLINK, "9.1.1.1", @@ -459,7 +459,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 0, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c1, EpcTft::UPLINK, "9.1.1.1", @@ -469,7 +469,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 0, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c1, EpcTft::UPLINK, "9.1.1.1", @@ -479,7 +479,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 2, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c1, EpcTft::DOWNLINK, "9.1.1.1", @@ -489,7 +489,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 2, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c1, EpcTft::DOWNLINK, "9.1.1.1", @@ -499,7 +499,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 2, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c1, EpcTft::DOWNLINK, "9.1.1.1", @@ -509,7 +509,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 2, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c1, EpcTft::UPLINK, "9.1.1.1", @@ -519,7 +519,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 2, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c1, EpcTft::UPLINK, "9.1.1.1", @@ -529,7 +529,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 2, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c1, EpcTft::DOWNLINK, "9.1.1.1", @@ -539,7 +539,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 2, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); /////////////////////////// // check default TFT @@ -561,7 +561,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c2, EpcTft::UPLINK, "2.2.3.4", @@ -571,7 +571,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 5, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c2, EpcTft::UPLINK, "6.2.3.4", @@ -581,7 +581,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c2, EpcTft::DOWNLINK, "3.3.3.4", @@ -591,7 +591,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c2, EpcTft::DOWNLINK, "3.3.4.4", @@ -601,7 +601,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c2, EpcTft::UPLINK, "3.3.3.4", @@ -611,7 +611,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); // test remote port AddTestCase(new EpcTftClassifierTestCase(c2, @@ -623,7 +623,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c2, EpcTft::UPLINK, "9.1.1.1", @@ -633,7 +633,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c2, EpcTft::UPLINK, "9.1.1.1", @@ -643,7 +643,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c2, EpcTft::UPLINK, "9.1.1.1", @@ -653,7 +653,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c2, EpcTft::DOWNLINK, "9.1.1.1", @@ -663,7 +663,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c2, EpcTft::DOWNLINK, "9.1.1.1", @@ -673,7 +673,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c2, EpcTft::DOWNLINK, "9.1.1.1", @@ -683,7 +683,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); // test local port AddTestCase(new EpcTftClassifierTestCase(c2, @@ -695,7 +695,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c2, EpcTft::UPLINK, "9.1.1.1", @@ -705,7 +705,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c2, EpcTft::UPLINK, "9.1.1.1", @@ -715,7 +715,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c2, EpcTft::UPLINK, "9.1.1.1", @@ -725,7 +725,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c2, EpcTft::DOWNLINK, "9.1.1.1", @@ -735,7 +735,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c2, EpcTft::DOWNLINK, "9.1.1.1", @@ -745,7 +745,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); /////////////////////////////////////////// // check default TFT plus dedicated ones @@ -768,7 +768,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 2, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c3, EpcTft::UPLINK, "2.2.3.4", @@ -778,7 +778,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 5, 2, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c3, EpcTft::UPLINK, "6.2.3.4", @@ -788,7 +788,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c3, EpcTft::DOWNLINK, "3.3.3.4", @@ -798,7 +798,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 2, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c3, EpcTft::DOWNLINK, "3.3.4.4", @@ -808,7 +808,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c3, EpcTft::UPLINK, "3.3.3.4", @@ -818,7 +818,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); // test remote port AddTestCase(new EpcTftClassifierTestCase(c3, @@ -830,7 +830,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 3, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c3, EpcTft::UPLINK, "9.1.1.1", @@ -840,7 +840,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 3, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c3, EpcTft::UPLINK, "9.1.1.1", @@ -850,7 +850,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 3, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c3, EpcTft::UPLINK, "9.1.1.1", @@ -860,7 +860,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c3, EpcTft::DOWNLINK, "9.1.1.1", @@ -870,7 +870,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c3, EpcTft::DOWNLINK, "9.1.1.1", @@ -880,7 +880,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c3, EpcTft::DOWNLINK, "9.1.1.1", @@ -890,7 +890,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); // test local port AddTestCase(new EpcTftClassifierTestCase(c3, @@ -902,7 +902,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c3, EpcTft::UPLINK, "9.1.1.1", @@ -912,7 +912,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c3, EpcTft::UPLINK, "9.1.1.1", @@ -922,7 +922,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c3, EpcTft::UPLINK, "9.1.1.1", @@ -932,7 +932,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 3, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c3, EpcTft::DOWNLINK, "9.1.1.1", @@ -942,7 +942,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 3, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c3, EpcTft::DOWNLINK, "9.1.1.1", @@ -952,7 +952,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 3, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); /////////////////////////////////////////// // check two TFTs with different ports @@ -974,7 +974,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 0, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c4, EpcTft::DOWNLINK, "9.1.1.1", @@ -984,7 +984,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c4, EpcTft::UPLINK, "9.1.1.1", @@ -994,7 +994,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 1, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c4, EpcTft::UPLINK, "9.1.1.1", @@ -1004,7 +1004,7 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 2, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EpcTftClassifierTestCase(c4, EpcTft::DOWNLINK, "9.1.1.1", @@ -1014,6 +1014,6 @@ EpcTftClassifierTestSuite::EpcTftClassifierTestSuite() 0, 2, useIpv6), - TestCase::QUICK); + TestCase::Duration::QUICK); } } diff --git a/src/lte/test/test-lte-antenna.cc b/src/lte/test/test-lte-antenna.cc index ce630d405..0064f21a7 100644 --- a/src/lte/test/test-lte-antenna.cc +++ b/src/lte/test/test-lte-antenna.cc @@ -278,34 +278,46 @@ LteAntennaTestSuite::LteAntennaTestSuite() NS_LOG_FUNCTION(this); // orientation beamwidth x y gain - AddTestCase(new LteEnbAntennaTestCase(0.0, 90.0, 1.0, 0.0, 0.0), TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(0.0, 90.0, 1.0, 1.0, -3.0), TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(0.0, 90.0, 1.0, -1.0, -3.0), TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(0.0, 90.0, -1.0, -1.0, -36.396), TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(0.0, 90.0, -1.0, -0.0, -1414.6), TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(0.0, 90.0, -1.0, 1.0, -36.396), TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(45.0, 90.0, 1.0, 1.0, 0.0), TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(-45.0, 90.0, 1.0, -1.0, 0.0), TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(90.0, 90.0, 1.0, 1.0, -3.0), TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(-90.0, 90.0, 1.0, -1.0, -3.0), TestCase::QUICK); + AddTestCase(new LteEnbAntennaTestCase(0.0, 90.0, 1.0, 0.0, 0.0), TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(0.0, 90.0, 1.0, 1.0, -3.0), TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(0.0, 90.0, 1.0, -1.0, -3.0), TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(0.0, 90.0, -1.0, -1.0, -36.396), + TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(0.0, 90.0, -1.0, -0.0, -1414.6), + TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(0.0, 90.0, -1.0, 1.0, -36.396), + TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(45.0, 90.0, 1.0, 1.0, 0.0), TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(-45.0, 90.0, 1.0, -1.0, 0.0), TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(90.0, 90.0, 1.0, 1.0, -3.0), TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(-90.0, 90.0, 1.0, -1.0, -3.0), TestCase::Duration::QUICK); - AddTestCase(new LteEnbAntennaTestCase(0.0, 120.0, 1.0, 0.0, 0.0), TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(0.0, 120.0, 0.5, sin(M_PI / 3), -3.0), TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(0.0, 120.0, 0.5, -sin(M_PI / 3), -3.0), TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(0.0, 120.0, -1.0, -2.0, -13.410), TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(0.0, 120.0, -1.0, 1.0, -20.034), TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(60.0, 120.0, 0.5, sin(M_PI / 3), 0.0), TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(-60.0, 120.0, 0.5, -sin(M_PI / 3), 0.0), TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(-60.0, 120.0, 0.5, -sin(M_PI / 3), 0.0), TestCase::QUICK); + AddTestCase(new LteEnbAntennaTestCase(0.0, 120.0, 1.0, 0.0, 0.0), TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(0.0, 120.0, 0.5, sin(M_PI / 3), -3.0), + TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(0.0, 120.0, 0.5, -sin(M_PI / 3), -3.0), + TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(0.0, 120.0, -1.0, -2.0, -13.410), + TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(0.0, 120.0, -1.0, 1.0, -20.034), + TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(60.0, 120.0, 0.5, sin(M_PI / 3), 0.0), + TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(-60.0, 120.0, 0.5, -sin(M_PI / 3), 0.0), + TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(-60.0, 120.0, 0.5, -sin(M_PI / 3), 0.0), + TestCase::Duration::QUICK); AddTestCase(new LteEnbAntennaTestCase(-120.0, 120.0, -0.5, -sin(M_PI / 3), 0.0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteEnbAntennaTestCase(-120.0, 120.0, 0.5, -sin(M_PI / 3), -3.0), - TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(-120.0, 120.0, -1, 0, -3.0), TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(-120.0, 120.0, -1, 2, -15.578), TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(-120.0, 120.0, 1, 0, -14.457), TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(-120.0, 120.0, 1, 2, -73.154), TestCase::QUICK); - AddTestCase(new LteEnbAntennaTestCase(-120.0, 120.0, 1, -0.1, -12.754), TestCase::QUICK); + TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(-120.0, 120.0, -1, 0, -3.0), TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(-120.0, 120.0, -1, 2, -15.578), + TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(-120.0, 120.0, 1, 0, -14.457), TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(-120.0, 120.0, 1, 2, -73.154), TestCase::Duration::QUICK); + AddTestCase(new LteEnbAntennaTestCase(-120.0, 120.0, 1, -0.1, -12.754), + TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/test-lte-epc-e2e-data.cc b/src/lte/test/test-lte-epc-e2e-data.cc index ce23efd75..086c323c4 100644 --- a/src/lte/test/test-lte-epc-e2e-data.cc +++ b/src/lte/test/test-lte-epc-e2e-data.cc @@ -389,7 +389,7 @@ LteEpcE2eDataTestSuite::LteEpcE2eDataTestSuite() u1.bearers.push_back(f1); e1.ues.push_back(u1); v1.push_back(e1); - AddTestCase(new LteEpcE2eDataTestCase("1 eNB, 1UE", v1), TestCase::QUICK); + AddTestCase(new LteEpcE2eDataTestCase("1 eNB, 1UE", v1), TestCase::Duration::QUICK); std::vector v2; EnbTestData e2; @@ -402,12 +402,12 @@ LteEpcE2eDataTestSuite::LteEpcE2eDataTestSuite() u2_2.bearers.push_back(f2_2); e2.ues.push_back(u2_2); v2.push_back(e2); - AddTestCase(new LteEpcE2eDataTestCase("1 eNB, 2UEs", v2), TestCase::EXTENSIVE); + AddTestCase(new LteEpcE2eDataTestCase("1 eNB, 2UEs", v2), TestCase::Duration::EXTENSIVE); std::vector v3; v3.push_back(e1); v3.push_back(e2); - AddTestCase(new LteEpcE2eDataTestCase("2 eNBs", v3), TestCase::EXTENSIVE); + AddTestCase(new LteEpcE2eDataTestCase("2 eNBs", v3), TestCase::Duration::EXTENSIVE); EnbTestData e4; UeTestData u4_1; @@ -426,7 +426,7 @@ LteEpcE2eDataTestSuite::LteEpcE2eDataTestSuite() v4.push_back(e4); v4.push_back(e1); v4.push_back(e2); - AddTestCase(new LteEpcE2eDataTestCase("3 eNBs", v4), TestCase::EXTENSIVE); + AddTestCase(new LteEpcE2eDataTestCase("3 eNBs", v4), TestCase::Duration::EXTENSIVE); EnbTestData e5; UeTestData u5; @@ -436,7 +436,7 @@ LteEpcE2eDataTestSuite::LteEpcE2eDataTestSuite() std::vector v5; v5.push_back(e5); AddTestCase(new LteEpcE2eDataTestCase("1 eNB, 1UE with 1000 byte packets", v5), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); EnbTestData e6; UeTestData u6; @@ -446,7 +446,7 @@ LteEpcE2eDataTestSuite::LteEpcE2eDataTestSuite() std::vector v6; v6.push_back(e6); AddTestCase(new LteEpcE2eDataTestCase("1 eNB, 1UE with 1400 byte packets", v6), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); EnbTestData e7; UeTestData u7; @@ -457,7 +457,8 @@ LteEpcE2eDataTestSuite::LteEpcE2eDataTestSuite() e7.ues.push_back(u7); std::vector v7; v7.push_back(e7); - AddTestCase(new LteEpcE2eDataTestCase("1 eNB, 1UE with 2 bearers", v7), TestCase::EXTENSIVE); + AddTestCase(new LteEpcE2eDataTestCase("1 eNB, 1UE with 2 bearers", v7), + TestCase::Duration::EXTENSIVE); EnbTestData e8; UeTestData u8; @@ -467,7 +468,7 @@ LteEpcE2eDataTestSuite::LteEpcE2eDataTestSuite() std::vector v8; v8.push_back(e8); AddTestCase(new LteEpcE2eDataTestCase("1 eNB, 1UE with fragmentation", v8), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); EnbTestData e9; UeTestData u9; @@ -476,5 +477,6 @@ LteEpcE2eDataTestSuite::LteEpcE2eDataTestSuite() e9.ues.push_back(u9); std::vector v9; v9.push_back(e9); - AddTestCase(new LteEpcE2eDataTestCase("1 eNB, 1UE with aggregation", v9), TestCase::EXTENSIVE); + AddTestCase(new LteEpcE2eDataTestCase("1 eNB, 1UE with aggregation", v9), + TestCase::Duration::EXTENSIVE); } diff --git a/src/lte/test/test-lte-handover-delay.cc b/src/lte/test/test-lte-handover-delay.cc index 783831d19..d5824787d 100644 --- a/src/lte/test/test-lte-handover-delay.cc +++ b/src/lte/test/test-lte-handover-delay.cc @@ -309,13 +309,13 @@ static class LteHandoverDelayTestSuite : public TestSuite // arguments: useIdealRrc, handoverTime, delayThreshold, simulationDuration AddTestCase( new LteHandoverDelayTestCase(1, true, handoverTime, Seconds(0.005), Seconds(0.200)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new LteHandoverDelayTestCase(2, true, handoverTime, Seconds(0.005), Seconds(0.200)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new LteHandoverDelayTestCase(4, true, handoverTime, Seconds(0.005), Seconds(0.200)), - TestCase::QUICK); + TestCase::Duration::QUICK); } // HANDOVER DELAY TEST CASES WITH REAL RRC (THRESHOLD = 0.020 sec) @@ -329,19 +329,19 @@ static class LteHandoverDelayTestSuite : public TestSuite handoverTime, Seconds(0.020), Seconds(0.200)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHandoverDelayTestCase(2, false, handoverTime, Seconds(0.020), Seconds(0.200)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHandoverDelayTestCase(4, false, handoverTime, Seconds(0.020), Seconds(0.200)), - TestCase::QUICK); + TestCase::Duration::QUICK); } } } g_lteHandoverDelayTestSuite; ///< the test suite diff --git a/src/lte/test/test-lte-handover-failure.cc b/src/lte/test/test-lte-handover-failure.cc index 5181a121b..77ad1533c 100644 --- a/src/lte/test/test-lte-handover-failure.cc +++ b/src/lte/test/test-lte-handover-failure.cc @@ -391,7 +391,7 @@ static class LteHandoverFailureTestSuite : public TestSuite MilliSeconds(200), MilliSeconds(500), 2500), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHandoverFailureTestCase( "REAL Handover failure due to non-allocation of non-contention preamble at " "target eNodeB due to max number reached", @@ -404,7 +404,7 @@ static class LteHandoverFailureTestSuite : public TestSuite MilliSeconds(200), MilliSeconds(500), 1500), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHandoverFailureTestCase( "REAL Handover failure due to HANDOVER JOINING timeout before reception of " "RRC CONNECTION RECONFIGURATION at source eNodeB", @@ -417,7 +417,7 @@ static class LteHandoverFailureTestSuite : public TestSuite MilliSeconds(0), MilliSeconds(500), 1500), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHandoverFailureTestCase( "REAL Handover failure due to HANDOVER JOINING timeout before completion " "of non-contention RACH process to target eNodeB", @@ -430,7 +430,7 @@ static class LteHandoverFailureTestSuite : public TestSuite MilliSeconds(15), MilliSeconds(500), 1500), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHandoverFailureTestCase( "REAL Handover failure due to HANDOVER JOINING timeout before reception of " "RRC CONNECTION RECONFIGURATION COMPLETE at target eNodeB", @@ -443,7 +443,7 @@ static class LteHandoverFailureTestSuite : public TestSuite MilliSeconds(18), MilliSeconds(500), 500), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHandoverFailureTestCase( "REAL Handover failure due to HANDOVER LEAVING timeout before reception of " "RRC CONNECTION RECONFIGURATION at source eNodeB", @@ -456,7 +456,7 @@ static class LteHandoverFailureTestSuite : public TestSuite MilliSeconds(200), MilliSeconds(0), 1500), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHandoverFailureTestCase( "REAL Handover failure due to HANDOVER LEAVING timeout before completion " "of non-contention RACH process to target eNodeB", @@ -469,7 +469,7 @@ static class LteHandoverFailureTestSuite : public TestSuite MilliSeconds(200), MilliSeconds(15), 1500), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHandoverFailureTestCase( "REAL Handover failure due to HANDOVER LEAVING timeout before reception of " "RRC CONNECTION RECONFIGURATION COMPLETE at target eNodeB", @@ -482,7 +482,7 @@ static class LteHandoverFailureTestSuite : public TestSuite MilliSeconds(200), MilliSeconds(18), 500), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test cases for IDEAL RRC protocol AddTestCase(new LteHandoverFailureTestCase("IDEAL Handover failure due to maximum RACH " @@ -496,7 +496,7 @@ static class LteHandoverFailureTestSuite : public TestSuite MilliSeconds(200), MilliSeconds(500), 1500), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHandoverFailureTestCase( "IDEAL Handover failure due to non-allocation of non-contention preamble " "at target eNodeB due to max number reached", @@ -509,7 +509,7 @@ static class LteHandoverFailureTestSuite : public TestSuite MilliSeconds(200), MilliSeconds(500), 1500), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHandoverFailureTestCase( "IDEAL Handover failure due to HANDOVER JOINING timeout before reception " "of RRC CONNECTION RECONFIGURATION at source eNodeB", @@ -522,7 +522,7 @@ static class LteHandoverFailureTestSuite : public TestSuite MilliSeconds(0), MilliSeconds(500), 1500), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHandoverFailureTestCase( "IDEAL Handover failure due to HANDOVER JOINING timeout before completion " "of non-contention RACH process to target eNodeB", @@ -535,7 +535,7 @@ static class LteHandoverFailureTestSuite : public TestSuite MilliSeconds(10), MilliSeconds(500), 1500), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHandoverFailureTestCase( "IDEAL Handover failure due to HANDOVER JOINING timeout before reception " "of RRC CONNECTION RECONFIGURATION COMPLETE at target eNodeB", @@ -548,7 +548,7 @@ static class LteHandoverFailureTestSuite : public TestSuite MilliSeconds(4), MilliSeconds(500), 500), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHandoverFailureTestCase( "IDEAL Handover failure due to HANDOVER LEAVING timeout before reception " "of RRC CONNECTION RECONFIGURATION at source eNodeB", @@ -561,7 +561,7 @@ static class LteHandoverFailureTestSuite : public TestSuite MilliSeconds(500), MilliSeconds(0), 1500), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHandoverFailureTestCase( "IDEAL Handover failure due to HANDOVER LEAVING timeout before completion " "of non-contention RACH process to target eNodeB", @@ -574,7 +574,7 @@ static class LteHandoverFailureTestSuite : public TestSuite MilliSeconds(500), MilliSeconds(10), 1500), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHandoverFailureTestCase( "IDEAL Handover failure due to HANDOVER LEAVING timeout before reception " "of RRC CONNECTION RECONFIGURATION COMPLETE at target eNodeB", @@ -587,6 +587,6 @@ static class LteHandoverFailureTestSuite : public TestSuite MilliSeconds(500), MilliSeconds(4), 500), - TestCase::QUICK); + TestCase::Duration::QUICK); } } g_lteHandoverFailureTestSuite; ///< end of LteHandoverFailureTestSuite () diff --git a/src/lte/test/test-lte-handover-target.cc b/src/lte/test/test-lte-handover-target.cc index 45d851491..b8c974772 100644 --- a/src/lte/test/test-lte-handover-target.cc +++ b/src/lte/test/test-lte-handover-target.cc @@ -413,7 +413,7 @@ LteHandoverTargetTestSuite::LteHandoverTargetTestSuite() 1, 3, "ns3::A2A4RsrqHandoverAlgorithm"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteHandoverTargetTestCase("4 cells and strongest cell algorithm", Vector(20, 40, 0), 2, @@ -421,7 +421,7 @@ LteHandoverTargetTestSuite::LteHandoverTargetTestSuite() 1, 3, "ns3::A3RsrpHandoverAlgorithm"), - TestCase::QUICK); + TestCase::Duration::QUICK); /* * 4 --- 5 --- 6 @@ -436,7 +436,7 @@ LteHandoverTargetTestSuite::LteHandoverTargetTestSuite() 5, 2, "ns3::A2A4RsrqHandoverAlgorithm"), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteHandoverTargetTestCase("6 cells and strongest cell algorithm", Vector(150, 90, 0), 3, @@ -444,7 +444,7 @@ LteHandoverTargetTestSuite::LteHandoverTargetTestSuite() 5, 2, "ns3::A3RsrpHandoverAlgorithm"), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); } // end of LteHandoverTargetTestSuite () diff --git a/src/lte/test/test-lte-rlc-header.cc b/src/lte/test/test-lte-rlc-header.cc index bc696a2a0..6446f19b9 100644 --- a/src/lte/test/test-lte-rlc-header.cc +++ b/src/lte/test/test-lte-rlc-header.cc @@ -201,14 +201,14 @@ LteRlcHeaderTestSuite::LteRlcHeaderTestSuite() SequenceNumber10 ackSn(8); std::list nackSnList; std::string hex("0020"); - AddTestCase(new RlcAmStatusPduTestCase(ackSn, nackSnList, hex), TestCase::QUICK); + AddTestCase(new RlcAmStatusPduTestCase(ackSn, nackSnList, hex), TestCase::Duration::QUICK); } { SequenceNumber10 ackSn(873); std::list nackSnList; std::string hex("0da4"); - AddTestCase(new RlcAmStatusPduTestCase(ackSn, nackSnList, hex), TestCase::QUICK); + AddTestCase(new RlcAmStatusPduTestCase(ackSn, nackSnList, hex), TestCase::Duration::QUICK); } { @@ -217,7 +217,7 @@ LteRlcHeaderTestSuite::LteRlcHeaderTestSuite() SequenceNumber10(873), }; std::string hex("000bb480"); - AddTestCase(new RlcAmStatusPduTestCase(ackSn, nackSnList, hex), TestCase::QUICK); + AddTestCase(new RlcAmStatusPduTestCase(ackSn, nackSnList, hex), TestCase::Duration::QUICK); } { @@ -227,7 +227,7 @@ LteRlcHeaderTestSuite::LteRlcHeaderTestSuite() SequenceNumber10(754), }; std::string hex("000bfed790"); - AddTestCase(new RlcAmStatusPduTestCase(ackSn, nackSnList, hex), TestCase::QUICK); + AddTestCase(new RlcAmStatusPduTestCase(ackSn, nackSnList, hex), TestCase::Duration::QUICK); } { @@ -238,7 +238,7 @@ LteRlcHeaderTestSuite::LteRlcHeaderTestSuite() SequenceNumber10(947), }; std::string hex("000bfed795d980"); - AddTestCase(new RlcAmStatusPduTestCase(ackSn, nackSnList, hex), TestCase::QUICK); + AddTestCase(new RlcAmStatusPduTestCase(ackSn, nackSnList, hex), TestCase::Duration::QUICK); } { @@ -250,7 +250,7 @@ LteRlcHeaderTestSuite::LteRlcHeaderTestSuite() SequenceNumber10(347), }; std::string hex("000bfed795d9cad8"); - AddTestCase(new RlcAmStatusPduTestCase(ackSn, nackSnList, hex), TestCase::QUICK); + AddTestCase(new RlcAmStatusPduTestCase(ackSn, nackSnList, hex), TestCase::Duration::QUICK); } } diff --git a/src/lte/test/test-lte-rrc.cc b/src/lte/test/test-lte-rrc.cc index 36c26e3b0..5901c5fdd 100644 --- a/src/lte/test/test-lte-rrc.cc +++ b/src/lte/test/test-lte-rrc.cc @@ -790,64 +790,64 @@ LteRrcTestSuite::LteRrcTestSuite() // admitRrcConnectionRequest AddTestCase( new LteRrcConnectionEstablishmentTestCase(1, 0, 0, 0, 1, false, useIdealRrc, true), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(1, 0, 100, 0, 1, false, useIdealRrc, true), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(1, 1, 0, 0, 1, false, useIdealRrc, true), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(1, 1, 100, 0, 1, false, useIdealRrc, true), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(1, 2, 0, 0, 1, false, useIdealRrc, true), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(1, 2, 100, 0, 1, false, useIdealRrc, true), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(2, 0, 20, 0, 1, false, useIdealRrc, true), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(2, 0, 20, 10, 1, false, useIdealRrc, true), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(2, 0, 20, 100, 1, false, useIdealRrc, true), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(2, 1, 20, 0, 1, false, useIdealRrc, true), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(2, 1, 20, 10, 1, false, useIdealRrc, true), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(2, 1, 20, 100, 1, false, useIdealRrc, true), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(2, 2, 20, 0, 1, false, useIdealRrc, true), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(2, 2, 20, 10, 1, false, useIdealRrc, true), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new LteRrcConnectionEstablishmentTestCase(2, 2, 20, 100, 1, false, useIdealRrc, true), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(3, 0, 20, 0, 1, false, useIdealRrc, true), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(4, 0, 20, 0, 1, false, useIdealRrc, true), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(4, 0, 20, 300, 1, false, useIdealRrc, true), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(20, 0, 10, 1, 1, false, useIdealRrc, true), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(50, 0, 0, 0, 1, false, useIdealRrc, true), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); // Test cases to check admitRrcConnectionRequest=false // nUes tConnBase delayDiscStart @@ -857,28 +857,28 @@ LteRrcTestSuite::LteRrcTestSuite() // admitRrcConnectionRequest AddTestCase( new LteRrcConnectionEstablishmentTestCase(1, 0, 0, 0, 1, false, useIdealRrc, false), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(1, 2, 100, 0, 1, false, useIdealRrc, false), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(2, 0, 20, 0, 1, false, useIdealRrc, false), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase( new LteRrcConnectionEstablishmentTestCase(2, 1, 20, 0, 1, false, useIdealRrc, false), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new LteRrcConnectionEstablishmentTestCase(3, 0, 20, 0, 1, false, useIdealRrc, false), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); } // Test cases with transmission error AddTestCase(new LteRrcConnectionEstablishmentErrorTestCase(Seconds(0.020214), "failure at RRC Connection Request"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteRrcConnectionEstablishmentErrorTestCase(Seconds(0.025), "failure at RRC Connection Setup"), - TestCase::QUICK); + TestCase::Duration::QUICK); /* * With RLF implementation we now do support the Idle mode, * thus it solve Bug 1762 Comment #25. @@ -886,7 +886,7 @@ LteRrcTestSuite::LteRrcTestSuite() AddTestCase( new LteRrcConnectionEstablishmentErrorTestCase(Seconds(0.030), "failure at RRC Connection Setup Complete"), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** diff --git a/src/lte/test/test-lte-x2-handover-measures.cc b/src/lte/test/test-lte-x2-handover-measures.cc index 9d54ac368..5e152556b 100644 --- a/src/lte/test/test-lte-x2-handover-measures.cc +++ b/src/lte/test/test-lte-x2-handover-measures.cc @@ -789,7 +789,7 @@ LteX2HandoverMeasuresTestSuite::LteX2HandoverMeasuresTestSuite() ho, true, useIdealRrc), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); AddTestCase(new LteX2HandoverMeasuresTestCase(2, 1, 1, @@ -800,7 +800,7 @@ LteX2HandoverMeasuresTestSuite::LteX2HandoverMeasuresTestSuite() ho, true, useIdealRrc), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteX2HandoverMeasuresTestCase(2, 1, 2, @@ -811,7 +811,7 @@ LteX2HandoverMeasuresTestSuite::LteX2HandoverMeasuresTestSuite() ho, true, useIdealRrc), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); AddTestCase(new LteX2HandoverMeasuresTestCase(3, 1, 0, @@ -822,7 +822,7 @@ LteX2HandoverMeasuresTestSuite::LteX2HandoverMeasuresTestSuite() ho, true, useIdealRrc), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); AddTestCase(new LteX2HandoverMeasuresTestCase(3, 1, 1, @@ -833,7 +833,7 @@ LteX2HandoverMeasuresTestSuite::LteX2HandoverMeasuresTestSuite() ho, true, useIdealRrc), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); AddTestCase(new LteX2HandoverMeasuresTestCase(3, 1, 2, @@ -844,7 +844,7 @@ LteX2HandoverMeasuresTestSuite::LteX2HandoverMeasuresTestSuite() ho, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverMeasuresTestCase(4, 1, 0, @@ -855,7 +855,7 @@ LteX2HandoverMeasuresTestSuite::LteX2HandoverMeasuresTestSuite() ho, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverMeasuresTestCase(4, 1, 1, @@ -866,7 +866,7 @@ LteX2HandoverMeasuresTestSuite::LteX2HandoverMeasuresTestSuite() ho, true, useIdealRrc), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); AddTestCase(new LteX2HandoverMeasuresTestCase(4, 1, 2, @@ -877,7 +877,7 @@ LteX2HandoverMeasuresTestSuite::LteX2HandoverMeasuresTestSuite() ho, true, useIdealRrc), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); } sched = "ns3::RrFfMacScheduler"; @@ -894,7 +894,7 @@ LteX2HandoverMeasuresTestSuite::LteX2HandoverMeasuresTestSuite() ho, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverMeasuresTestCase(3, 1, 0, @@ -905,7 +905,7 @@ LteX2HandoverMeasuresTestSuite::LteX2HandoverMeasuresTestSuite() ho, true, useIdealRrc), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); AddTestCase(new LteX2HandoverMeasuresTestCase(4, 1, 0, @@ -916,7 +916,7 @@ LteX2HandoverMeasuresTestSuite::LteX2HandoverMeasuresTestSuite() ho, true, useIdealRrc), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); } ho = "ns3::A3RsrpHandoverAlgorithm"; @@ -934,7 +934,7 @@ LteX2HandoverMeasuresTestSuite::LteX2HandoverMeasuresTestSuite() ho, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverMeasuresTestCase(3, 1, 0, @@ -945,7 +945,7 @@ LteX2HandoverMeasuresTestSuite::LteX2HandoverMeasuresTestSuite() ho, true, useIdealRrc), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); AddTestCase(new LteX2HandoverMeasuresTestCase(4, 1, 0, @@ -956,7 +956,7 @@ LteX2HandoverMeasuresTestSuite::LteX2HandoverMeasuresTestSuite() ho, true, useIdealRrc), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); } sched = "ns3::RrFfMacScheduler"; @@ -973,7 +973,7 @@ LteX2HandoverMeasuresTestSuite::LteX2HandoverMeasuresTestSuite() ho, true, useIdealRrc), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteX2HandoverMeasuresTestCase(3, 1, 0, @@ -984,7 +984,7 @@ LteX2HandoverMeasuresTestSuite::LteX2HandoverMeasuresTestSuite() ho, true, useIdealRrc), - TestCase::TAKES_FOREVER); + TestCase::Duration::TAKES_FOREVER); AddTestCase(new LteX2HandoverMeasuresTestCase(4, 1, 0, @@ -995,7 +995,7 @@ LteX2HandoverMeasuresTestSuite::LteX2HandoverMeasuresTestSuite() ho, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); } } // end of LteX2HandoverMeasuresTestSuite () diff --git a/src/lte/test/test-lte-x2-handover.cc b/src/lte/test/test-lte-x2-handover.cc index b8cbbb297..118f604f9 100644 --- a/src/lte/test/test-lte-x2-handover.cc +++ b/src/lte/test/test-lte-x2-handover.cc @@ -772,7 +772,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(2, 0, handoverEventList0, @@ -780,7 +780,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(1, 5, handoverEventList0, @@ -788,7 +788,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(2, 5, handoverEventList0, @@ -796,7 +796,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(1, 0, handoverEventList1, @@ -804,7 +804,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(1, 1, handoverEventList1, @@ -812,7 +812,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(1, 2, handoverEventList1, @@ -820,7 +820,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(1, 0, handoverEventList1, @@ -828,7 +828,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, false, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(1, 1, handoverEventList1, @@ -836,7 +836,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, false, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(1, 2, handoverEventList1, @@ -844,7 +844,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, false, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(2, 0, handoverEventList1, @@ -852,7 +852,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(2, 1, handoverEventList1, @@ -860,7 +860,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(2, 2, handoverEventList1, @@ -868,7 +868,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(2, 0, handoverEventList1, @@ -876,7 +876,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, false, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(2, 1, handoverEventList1, @@ -884,7 +884,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, false, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(2, 2, handoverEventList1, @@ -892,7 +892,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, false, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(1, 0, handoverEventList2, @@ -900,7 +900,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(1, 1, handoverEventList2, @@ -908,7 +908,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(1, 2, handoverEventList2, @@ -916,7 +916,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(1, 0, handoverEventList3, @@ -924,7 +924,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(1, 1, handoverEventList3, @@ -932,7 +932,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(1, 2, handoverEventList3, @@ -940,7 +940,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(2, 0, handoverEventList3, @@ -948,7 +948,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(2, 1, handoverEventList3, @@ -956,7 +956,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(2, 2, handoverEventList3, @@ -964,7 +964,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new LteX2HandoverTestCase(2, 0, handoverEventList4, @@ -972,7 +972,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(2, 1, handoverEventList4, @@ -980,7 +980,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(2, 2, handoverEventList4, @@ -988,7 +988,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(2, 0, handoverEventList5, @@ -996,7 +996,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(2, 1, handoverEventList5, @@ -1004,7 +1004,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(2, 2, handoverEventList5, @@ -1012,7 +1012,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(3, 0, handoverEventList3, @@ -1020,7 +1020,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(3, 1, handoverEventList3, @@ -1028,7 +1028,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(3, 2, handoverEventList3, @@ -1036,7 +1036,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(3, 0, handoverEventList4, @@ -1044,7 +1044,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(3, 1, handoverEventList4, @@ -1052,7 +1052,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(3, 2, handoverEventList4, @@ -1060,7 +1060,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(3, 0, handoverEventList5, @@ -1068,7 +1068,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(3, 1, handoverEventList5, @@ -1076,7 +1076,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new LteX2HandoverTestCase(3, 2, handoverEventList5, @@ -1084,7 +1084,7 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() *schedIt, true, useIdealRrc), - TestCase::QUICK); + TestCase::Duration::QUICK); } } } diff --git a/src/mesh/test/dot11s/dot11s-test-suite.cc b/src/mesh/test/dot11s/dot11s-test-suite.cc index b1cdaa3b8..8c0b5b77d 100644 --- a/src/mesh/test/dot11s/dot11s-test-suite.cc +++ b/src/mesh/test/dot11s/dot11s-test-suite.cc @@ -287,9 +287,9 @@ class Dot11sTestSuite : public TestSuite Dot11sTestSuite::Dot11sTestSuite() : TestSuite("devices-mesh-dot11s", UNIT) { - AddTestCase(new MeshHeaderTest, TestCase::QUICK); - AddTestCase(new HwmpRtableTest, TestCase::QUICK); - AddTestCase(new PeerLinkFrameStartTest, TestCase::QUICK); + AddTestCase(new MeshHeaderTest, TestCase::Duration::QUICK); + AddTestCase(new HwmpRtableTest, TestCase::Duration::QUICK); + AddTestCase(new PeerLinkFrameStartTest, TestCase::Duration::QUICK); } static Dot11sTestSuite g_dot11sTestSuite; ///< the test suite diff --git a/src/mesh/test/dot11s/regression.cc b/src/mesh/test/dot11s/regression.cc index 6d924c611..c65a33391 100644 --- a/src/mesh/test/dot11s/regression.cc +++ b/src/mesh/test/dot11s/regression.cc @@ -41,10 +41,10 @@ class Dot11sRegressionSuite : public TestSuite // We do not use NS_TEST_SOURCEDIR variable here since mesh/test has // subdirectories SetDataDir(std::string("src/mesh/test/dot11s")); - AddTestCase(new PeerManagementProtocolRegressionTest, TestCase::QUICK); - AddTestCase(new HwmpSimplestRegressionTest, TestCase::QUICK); - AddTestCase(new HwmpReactiveRegressionTest, TestCase::QUICK); - AddTestCase(new HwmpProactiveRegressionTest, TestCase::QUICK); - AddTestCase(new HwmpDoRfRegressionTest, TestCase::QUICK); + AddTestCase(new PeerManagementProtocolRegressionTest, TestCase::Duration::QUICK); + AddTestCase(new HwmpSimplestRegressionTest, TestCase::Duration::QUICK); + AddTestCase(new HwmpReactiveRegressionTest, TestCase::Duration::QUICK); + AddTestCase(new HwmpProactiveRegressionTest, TestCase::Duration::QUICK); + AddTestCase(new HwmpDoRfRegressionTest, TestCase::Duration::QUICK); } } g_dot11sRegressionSuite; ///< the test suite diff --git a/src/mesh/test/flame/flame-test-suite.cc b/src/mesh/test/flame/flame-test-suite.cc index be4c1ee93..fa020218d 100644 --- a/src/mesh/test/flame/flame-test-suite.cc +++ b/src/mesh/test/flame/flame-test-suite.cc @@ -153,8 +153,8 @@ class FlameTestSuite : public TestSuite FlameTestSuite::FlameTestSuite() : TestSuite("devices-mesh-flame", UNIT) { - AddTestCase(new FlameHeaderTest, TestCase::QUICK); - AddTestCase(new FlameRtableTest, TestCase::QUICK); + AddTestCase(new FlameHeaderTest, TestCase::Duration::QUICK); + AddTestCase(new FlameRtableTest, TestCase::Duration::QUICK); } static FlameTestSuite g_flameTestSuite; ///< the test suite diff --git a/src/mesh/test/flame/regression.cc b/src/mesh/test/flame/regression.cc index 5db06b345..ae529a954 100644 --- a/src/mesh/test/flame/regression.cc +++ b/src/mesh/test/flame/regression.cc @@ -37,6 +37,6 @@ class FlameRegressionSuite : public TestSuite // We do not use NS_TEST_SOURCEDIR variable here since mesh/test has // subdirectories SetDataDir(std::string("src/mesh/test/flame")); - AddTestCase(new FlameRegressionTest, TestCase::QUICK); + AddTestCase(new FlameRegressionTest, TestCase::Duration::QUICK); } } g_flameRegressionSuite; ///< the test suite diff --git a/src/mesh/test/mesh-information-element-vector-test-suite.cc b/src/mesh/test/mesh-information-element-vector-test-suite.cc index cee386eb8..37803e1c8 100644 --- a/src/mesh/test/mesh-information-element-vector-test-suite.cc +++ b/src/mesh/test/mesh-information-element-vector-test-suite.cc @@ -164,7 +164,7 @@ class MeshTestSuite : public TestSuite MeshTestSuite::MeshTestSuite() : TestSuite("devices-mesh", UNIT) { - AddTestCase(new MeshInformationElementVectorBist, TestCase::QUICK); + AddTestCase(new MeshInformationElementVectorBist, TestCase::Duration::QUICK); } static MeshTestSuite g_meshTestSuite; ///< the test suite diff --git a/src/mobility/test/box-line-intersection-test.cc b/src/mobility/test/box-line-intersection-test.cc index c183237d7..3399da375 100644 --- a/src/mobility/test/box-line-intersection-test.cc +++ b/src/mobility/test/box-line-intersection-test.cc @@ -42,28 +42,28 @@ BoxLineIntersectionTestSuite::BoxLineIntersectionTestSuite() // Expected result: No intersection. The box is between the two position, // however, pos2 is above the height of the box. intersect = false; - AddTestCase(new BoxLineIntersectionTestCase(3, 6, box, intersect), TestCase::QUICK); + AddTestCase(new BoxLineIntersectionTestCase(3, 6, box, intersect), TestCase::Duration::QUICK); // Test #2 : // pos1 (index 1) is inside the box. // pos2 (index 2) is inside the box. // Expected result: Intersection. intersect = true; - AddTestCase(new BoxLineIntersectionTestCase(1, 2, box, intersect), TestCase::QUICK); + AddTestCase(new BoxLineIntersectionTestCase(1, 2, box, intersect), TestCase::Duration::QUICK); // Test #3 : // pos1 (index 3) is outside the box. // pos2 (index 1) is inside the box. // Expected result: Intersection. intersect = true; - AddTestCase(new BoxLineIntersectionTestCase(3, 1, box, intersect), TestCase::QUICK); + AddTestCase(new BoxLineIntersectionTestCase(3, 1, box, intersect), TestCase::Duration::QUICK); // Test #4: // pos1 (index 4) is outside the box. // pos2 (index 5) is outside the box. // Expected result: Intersection because box is in between the two positions. intersect = true; - AddTestCase(new BoxLineIntersectionTestCase(4, 5, box, intersect), TestCase::QUICK); + AddTestCase(new BoxLineIntersectionTestCase(4, 5, box, intersect), TestCase::Duration::QUICK); } static BoxLineIntersectionTestSuite boxLineIntersectionTestSuite; //!< boxLineIntersectionTestSuite diff --git a/src/mobility/test/geo-to-cartesian-test.cc b/src/mobility/test/geo-to-cartesian-test.cc index e903df793..d0413f18f 100644 --- a/src/mobility/test/geo-to-cartesian-test.cc +++ b/src/mobility/test/geo-to-cartesian-test.cc @@ -1815,13 +1815,13 @@ GeoToCartesianTestSuite::GeoToCartesianTestSuite() altitude, GeographicPositions::SPHERE, i), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CartesianToGeoTestCase(latitude, longitude, altitude, GeographicPositions::SPHERE, i), - TestCase::QUICK); + TestCase::Duration::QUICK); ++i; } } @@ -1838,13 +1838,13 @@ GeoToCartesianTestSuite::GeoToCartesianTestSuite() altitude, GeographicPositions::GRS80, i), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CartesianToGeoTestCase(latitude, longitude, altitude, GeographicPositions::GRS80, i), - TestCase::QUICK); + TestCase::Duration::QUICK); ++i; } } @@ -1861,13 +1861,13 @@ GeoToCartesianTestSuite::GeoToCartesianTestSuite() altitude, GeographicPositions::WGS84, i), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new CartesianToGeoTestCase(latitude, longitude, altitude, GeographicPositions::WGS84, i), - TestCase::QUICK); + TestCase::Duration::QUICK); ++i; } } diff --git a/src/mobility/test/mobility-test-suite.cc b/src/mobility/test/mobility-test-suite.cc index 5e78dd5e5..81e5cfa72 100644 --- a/src/mobility/test/mobility-test-suite.cc +++ b/src/mobility/test/mobility-test-suite.cc @@ -486,10 +486,10 @@ class MobilityTestSuite : public TestSuite MobilityTestSuite::MobilityTestSuite() : TestSuite("mobility", UNIT) { - AddTestCase(new WaypointLazyNotifyFalse, TestCase::QUICK); - AddTestCase(new WaypointLazyNotifyTrue, TestCase::QUICK); - AddTestCase(new WaypointInitialPositionIsWaypoint, TestCase::QUICK); - AddTestCase(new WaypointMobilityModelViaHelper, TestCase::QUICK); + AddTestCase(new WaypointLazyNotifyFalse, TestCase::Duration::QUICK); + AddTestCase(new WaypointLazyNotifyTrue, TestCase::Duration::QUICK); + AddTestCase(new WaypointInitialPositionIsWaypoint, TestCase::Duration::QUICK); + AddTestCase(new WaypointMobilityModelViaHelper, TestCase::Duration::QUICK); } /** diff --git a/src/mobility/test/mobility-trace-test-suite.cc b/src/mobility/test/mobility-trace-test-suite.cc index 589aad3a8..9c49ae3e8 100644 --- a/src/mobility/test/mobility-trace-test-suite.cc +++ b/src/mobility/test/mobility-trace-test-suite.cc @@ -126,7 +126,7 @@ class MobilityTraceTestSuite : public TestSuite MobilityTraceTestSuite::MobilityTraceTestSuite() : TestSuite("mobility-trace", UNIT) { - AddTestCase(new MobilityTraceTestCase, TestCase::QUICK); + AddTestCase(new MobilityTraceTestCase, TestCase::Duration::QUICK); } /** diff --git a/src/mobility/test/ns2-mobility-helper-test-suite.cc b/src/mobility/test/ns2-mobility-helper-test-suite.cc index 669459d43..6edce01b1 100644 --- a/src/mobility/test/ns2-mobility-helper-test-suite.cc +++ b/src/mobility/test/ns2-mobility-helper-test-suite.cc @@ -342,7 +342,7 @@ class Ns2MobilityHelperTestSuite : public TestSuite "$node_(0) set Y_ 2.0\n" "$node_(0) set Z_ 3.0\n"); t->AddReferencePoint("0", 0, Vector(1, 2, 3), Vector(0, 0, 0)); - AddTestCase(t, TestCase::QUICK); + AddTestCase(t, TestCase::Duration::QUICK); // Check parsing comments, empty lines and no EOF at the end of file t = new Ns2MobilityHelperTest("comments", Seconds(1)); @@ -353,7 +353,7 @@ class Ns2MobilityHelperTestSuite : public TestSuite "$node_(0) set Z_ 3.0 # $node_(0) set Z_ 3.0\n" "#$node_(0) set Z_ 100 #"); t->AddReferencePoint("0", 0, Vector(1, 2, 3), Vector(0, 0, 0)); - AddTestCase(t, TestCase::QUICK); + AddTestCase(t, TestCase::Duration::QUICK); // Simple setdest. Arguments are interpreted as x, y, speed by default t = new Ns2MobilityHelperTest("simple setdest", Seconds(10)); @@ -362,7 +362,7 @@ class Ns2MobilityHelperTestSuite : public TestSuite t->AddReferencePoint("0", 0, Vector(0, 0, 0), Vector(0, 0, 0)); t->AddReferencePoint("0", 1, Vector(0, 0, 0), Vector(5, 0, 0)); t->AddReferencePoint("0", 6, Vector(25, 0, 0), Vector(0, 0, 0)); - AddTestCase(t, TestCase::QUICK); + AddTestCase(t, TestCase::Duration::QUICK); // Several set and setdest. Arguments are interpreted as x, y, speed by default t = new Ns2MobilityHelperTest("square setdest", Seconds(6)); @@ -382,7 +382,7 @@ class Ns2MobilityHelperTestSuite : public TestSuite t->AddReferencePoint("0", 4, Vector(0, 5, 0), Vector(0, 0, 0)); t->AddReferencePoint("0", 4, Vector(0, 5, 0), Vector(0, -5, 0)); t->AddReferencePoint("0", 5, Vector(0, 0, 0), Vector(0, 0, 0)); - AddTestCase(t, TestCase::QUICK); + AddTestCase(t, TestCase::Duration::QUICK); // Copy of previous test case but with the initial positions at // the end of the trace rather than at the beginning. @@ -405,7 +405,7 @@ class Ns2MobilityHelperTestSuite : public TestSuite t->AddReferencePoint("0", 4, Vector(10, 15, 0), Vector(0, 0, 0)); t->AddReferencePoint("0", 4, Vector(10, 15, 0), Vector(0, -5, 0)); t->AddReferencePoint("0", 5, Vector(10, 10, 0), Vector(0, 0, 0)); - AddTestCase(t, TestCase::QUICK); + AddTestCase(t, TestCase::Duration::QUICK); // Scheduled set position t = new Ns2MobilityHelperTest("scheduled set position", Seconds(2)); @@ -416,7 +416,7 @@ class Ns2MobilityHelperTestSuite : public TestSuite t->AddReferencePoint("0", 1, Vector(10, 0, 0), Vector(0, 0, 0)); t->AddReferencePoint("0", 1, Vector(10, 0, 10), Vector(0, 0, 0)); t->AddReferencePoint("0", 1, Vector(10, 10, 10), Vector(0, 0, 0)); - AddTestCase(t, TestCase::QUICK); + AddTestCase(t, TestCase::Duration::QUICK); // Malformed lines t = new Ns2MobilityHelperTest("malformed lines", Seconds(2)); @@ -432,7 +432,7 @@ class Ns2MobilityHelperTestSuite : public TestSuite t->AddReferencePoint("0", 0, Vector(1, 2, 3), Vector(0, 0, 0)); t->AddReferencePoint("0", 1, Vector(1, 2, 3), Vector(1, 0, 0)); t->AddReferencePoint("0", 2, Vector(2, 2, 3), Vector(0, 0, 0)); - AddTestCase(t, TestCase::QUICK); + AddTestCase(t, TestCase::Duration::QUICK); // Non possible values t = new Ns2MobilityHelperTest("non possible values", Seconds(2)); @@ -453,7 +453,7 @@ class Ns2MobilityHelperTestSuite : public TestSuite t->AddReferencePoint("0", 0, Vector(1, 2, 3), Vector(0, 0, 0)); t->AddReferencePoint("0", 1, Vector(1, 2, 3), Vector(1, 0, 0)); t->AddReferencePoint("0", 2, Vector(2, 2, 3), Vector(0, 0, 0)); - AddTestCase(t, TestCase::QUICK); + AddTestCase(t, TestCase::Duration::QUICK); // More than one node t = new Ns2MobilityHelperTest("few nodes, combinations of set and setdest", Seconds(10), 3); @@ -481,7 +481,7 @@ class Ns2MobilityHelperTestSuite : public TestSuite t->AddReferencePoint("2", 4, Vector(0, 5, 0), Vector(0, 0, 0)); t->AddReferencePoint("2", 4, Vector(0, 5, 0), Vector(0, -5, 0)); t->AddReferencePoint("2", 5, Vector(0, 0, 0), Vector(0, 0, 0)); - AddTestCase(t, TestCase::QUICK); + AddTestCase(t, TestCase::Duration::QUICK); // Test for Speed == 0, that acts as stop the node. t = new Ns2MobilityHelperTest("setdest with speed cero", Seconds(10)); @@ -492,7 +492,7 @@ class Ns2MobilityHelperTestSuite : public TestSuite t->AddReferencePoint("0", 1, Vector(0, 0, 0), Vector(5, 0, 0)); t->AddReferencePoint("0", 6, Vector(25, 0, 0), Vector(0, 0, 0)); t->AddReferencePoint("0", 7, Vector(25, 0, 0), Vector(0, 0, 0)); - AddTestCase(t, TestCase::QUICK); + AddTestCase(t, TestCase::Duration::QUICK); // Test negative positions t = new Ns2MobilityHelperTest("test negative positions", Seconds(10)); @@ -506,7 +506,7 @@ class Ns2MobilityHelperTestSuite : public TestSuite t->AddReferencePoint("0", 2, Vector(0, 0, 0), Vector(0, 0, 0)); t->AddReferencePoint("0", 2, Vector(0, 0, 0), Vector(0, -1, 0)); t->AddReferencePoint("0", 3, Vector(0, -1, 0), Vector(0, 0, 0)); - AddTestCase(t, TestCase::QUICK); + AddTestCase(t, TestCase::Duration::QUICK); // Square setdest with values in the form 1.0e+2 t = new Ns2MobilityHelperTest("Foalt numbers in 1.0e+2 format", Seconds(6)); @@ -526,7 +526,7 @@ class Ns2MobilityHelperTestSuite : public TestSuite t->AddReferencePoint("0", 4, Vector(0, 100, 0), Vector(0, 0, 0)); t->AddReferencePoint("0", 4, Vector(0, 100, 0), Vector(0, -100, 0)); t->AddReferencePoint("0", 5, Vector(0, 0, 0), Vector(0, 0, 0)); - AddTestCase(t, TestCase::QUICK); + AddTestCase(t, TestCase::Duration::QUICK); t = new Ns2MobilityHelperTest("Bug 1219 testcase", Seconds(16)); t->SetTrace("$node_(0) set X_ 0.0\n" "$node_(0) set Y_ 0.0\n" @@ -537,13 +537,13 @@ class Ns2MobilityHelperTestSuite : public TestSuite t->AddReferencePoint("0", 1, Vector(0, 0, 0), Vector(0, 1, 0)); t->AddReferencePoint("0", 6, Vector(0, 5, 0), Vector(0, -1, 0)); t->AddReferencePoint("0", 16, Vector(0, -10, 0), Vector(0, 0, 0)); - AddTestCase(t, TestCase::QUICK); + AddTestCase(t, TestCase::Duration::QUICK); t = new Ns2MobilityHelperTest("Bug 1059 testcase", Seconds(16)); t->SetTrace("$node_(0) set X_ 10.0\r\n" "$node_(0) set Y_ 0.0\r\n"); // id t position velocity t->AddReferencePoint("0", 0, Vector(10, 0, 0), Vector(0, 0, 0)); - AddTestCase(t, TestCase::QUICK); + AddTestCase(t, TestCase::Duration::QUICK); t = new Ns2MobilityHelperTest("Bug 1301 testcase", Seconds(16)); t->SetTrace("$node_(0) set X_ 10.0\n" "$node_(0) set Y_ 0.0\n" @@ -552,7 +552,7 @@ class Ns2MobilityHelperTestSuite : public TestSuite // Moving to the current position must change nothing. No NaN // speed must be. t->AddReferencePoint("0", 0, Vector(10, 0, 0), Vector(0, 0, 0)); - AddTestCase(t, TestCase::QUICK); + AddTestCase(t, TestCase::Duration::QUICK); t = new Ns2MobilityHelperTest("Bug 1316 testcase", Seconds(1000)); t->SetTrace("$node_(0) set X_ 350.00000000000000\n" @@ -617,6 +617,6 @@ class Ns2MobilityHelperTestSuite : public TestSuite 920.000, Vector(300.000, 650.000, 0.000), Vector(0.000, 0.000, 0.000)); - AddTestCase(t, TestCase::QUICK); + AddTestCase(t, TestCase::Duration::QUICK); } } g_ns2TransmobilityHelperTestSuite; ///< the test suite diff --git a/src/mobility/test/rand-cart-around-geo-test.cc b/src/mobility/test/rand-cart-around-geo-test.cc index f1e4f0d48..08b1f3307 100644 --- a/src/mobility/test/rand-cart-around-geo-test.cc +++ b/src/mobility/test/rand-cart-around-geo-test.cc @@ -201,7 +201,7 @@ RandCartAroundGeoTestSuite::RandCartAroundGeoTestSuite() 50, // 50 points generated maxDistFromOrigin, uniRand), - TestCase::QUICK); + TestCase::Duration::QUICK); } } } diff --git a/src/mobility/test/rectangle-closest-border-test.cc b/src/mobility/test/rectangle-closest-border-test.cc index 07f6c9ca5..a69f8e701 100644 --- a/src/mobility/test/rectangle-closest-border-test.cc +++ b/src/mobility/test/rectangle-closest-border-test.cc @@ -117,47 +117,47 @@ RectangleClosestBorderTestSuite::RectangleClosestBorderTestSuite() */ // Left side (1 and 15) AddTestCase(new RectangleClosestBorderTestCase(-5, 5, rectangle, Rectangle::LEFTSIDE), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new RectangleClosestBorderTestCase(2, 5, rectangle, Rectangle::LEFTSIDE), - TestCase::QUICK); + TestCase::Duration::QUICK); // Right side (5 and 17) AddTestCase(new RectangleClosestBorderTestCase(17, 5, rectangle, Rectangle::RIGHTSIDE), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new RectangleClosestBorderTestCase(7, 5, rectangle, Rectangle::RIGHTSIDE), - TestCase::QUICK); + TestCase::Duration::QUICK); // Bottom side (8 and 14) AddTestCase(new RectangleClosestBorderTestCase(5, -7, rectangle, Rectangle::BOTTOMSIDE), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new RectangleClosestBorderTestCase(5, 1, rectangle, Rectangle::BOTTOMSIDE), - TestCase::QUICK); + TestCase::Duration::QUICK); // Top side (3 and 16) AddTestCase(new RectangleClosestBorderTestCase(5, 15, rectangle, Rectangle::TOPSIDE), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new RectangleClosestBorderTestCase(5, 7, rectangle, Rectangle::TOPSIDE), - TestCase::QUICK); + TestCase::Duration::QUICK); // Left-Bottom corner (9 and 10) AddTestCase(new RectangleClosestBorderTestCase(-1, -1, rectangle, Rectangle::BOTTOMLEFTCORNER), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new RectangleClosestBorderTestCase(0, 0, rectangle, Rectangle::BOTTOMLEFTCORNER), - TestCase::QUICK); + TestCase::Duration::QUICK); // Right-Bottom corner (7 and 13) AddTestCase(new RectangleClosestBorderTestCase(11, -1, rectangle, Rectangle::BOTTOMRIGHTCORNER), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new RectangleClosestBorderTestCase(9, 1, rectangle, Rectangle::BOTTOMRIGHTCORNER), - TestCase::QUICK); + TestCase::Duration::QUICK); // Left-Top corner (2 and 11) AddTestCase(new RectangleClosestBorderTestCase(-1, 11, rectangle, Rectangle::TOPLEFTCORNER), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new RectangleClosestBorderTestCase(1, 9, rectangle, Rectangle::TOPLEFTCORNER), - TestCase::QUICK); + TestCase::Duration::QUICK); // Right-Top corner (4 and 12) AddTestCase(new RectangleClosestBorderTestCase(11, 11, rectangle, Rectangle::TOPRIGHTCORNER), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new RectangleClosestBorderTestCase(9, 9, rectangle, Rectangle::TOPRIGHTCORNER), - TestCase::QUICK); + TestCase::Duration::QUICK); // Central position (18) AddTestCase(new RectangleClosestBorderTestCase(5, 5, rectangle, Rectangle::TOPSIDE), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** diff --git a/src/mobility/test/steady-state-random-waypoint-mobility-model-test.cc b/src/mobility/test/steady-state-random-waypoint-mobility-model-test.cc index bc9dd8fd7..02137b501 100644 --- a/src/mobility/test/steady-state-random-waypoint-mobility-model-test.cc +++ b/src/mobility/test/steady-state-random-waypoint-mobility-model-test.cc @@ -158,6 +158,6 @@ struct SteadyStateRandomWaypointTestSuite : public TestSuite SteadyStateRandomWaypointTestSuite() : TestSuite("steady-state-rwp-mobility-model", UNIT) { - AddTestCase(new SteadyStateRandomWaypointTest, TestCase::QUICK); + AddTestCase(new SteadyStateRandomWaypointTest, TestCase::Duration::QUICK); } } g_steadyStateRandomWaypointTestSuite; ///< the test suite diff --git a/src/mobility/test/waypoint-mobility-model-test.cc b/src/mobility/test/waypoint-mobility-model-test.cc index 32c92ae41..b32b314a7 100644 --- a/src/mobility/test/waypoint-mobility-model-test.cc +++ b/src/mobility/test/waypoint-mobility-model-test.cc @@ -261,8 +261,8 @@ static struct WaypointMobilityModelTestSuite : public TestSuite WaypointMobilityModelTestSuite() : TestSuite("waypoint-mobility-model", UNIT) { - AddTestCase(new WaypointMobilityModelNotifyTest(true), TestCase::QUICK); - AddTestCase(new WaypointMobilityModelNotifyTest(false), TestCase::QUICK); - AddTestCase(new WaypointMobilityModelAddWaypointTest(), TestCase::QUICK); + AddTestCase(new WaypointMobilityModelNotifyTest(true), TestCase::Duration::QUICK); + AddTestCase(new WaypointMobilityModelNotifyTest(false), TestCase::Duration::QUICK); + AddTestCase(new WaypointMobilityModelAddWaypointTest(), TestCase::Duration::QUICK); } } g_waypointMobilityModelTestSuite; ///< the test suite diff --git a/src/mpi/test/mpi-test-suite.cc b/src/mpi/test/mpi-test-suite.cc index 0c461f7aa..676546e0d 100644 --- a/src/mpi/test/mpi-test-suite.cc +++ b/src/mpi/test/mpi-test-suite.cc @@ -116,7 +116,7 @@ class MpiTestSuite : public TestSuite const std::string dataDir, const int ranks, const std::string args = "", - const TestDuration duration = QUICK, + const Duration duration = Duration::QUICK, const bool shouldNotErr = true) : TestSuite(name, EXAMPLE) { diff --git a/src/netanim/test/netanim-test.cc b/src/netanim/test/netanim-test.cc index 9b16dece9..de0f599d2 100644 --- a/src/netanim/test/netanim-test.cc +++ b/src/netanim/test/netanim-test.cc @@ -250,7 +250,7 @@ static class AnimationInterfaceTestSuite : public TestSuite AnimationInterfaceTestSuite() : TestSuite("animation-interface", UNIT) { - AddTestCase(new AnimationInterfaceTestCase(), TestCase::QUICK); - AddTestCase(new AnimationRemainingEnergyTestCase(), TestCase::QUICK); + AddTestCase(new AnimationInterfaceTestCase(), TestCase::Duration::QUICK); + AddTestCase(new AnimationRemainingEnergyTestCase(), TestCase::Duration::QUICK); } } g_animationInterfaceTestSuite; ///< the test suite diff --git a/src/network/test/bit-serializer-test.cc b/src/network/test/bit-serializer-test.cc index 88b106540..d6e2f438a 100644 --- a/src/network/test/bit-serializer-test.cc +++ b/src/network/test/bit-serializer-test.cc @@ -155,8 +155,8 @@ class BitSerializerTestSuite : public TestSuite BitSerializerTestSuite::BitSerializerTestSuite() : TestSuite("bit-serializer", UNIT) { - AddTestCase(new BitSerializerTest, TestCase::QUICK); - AddTestCase(new BitDeserializerTest, TestCase::QUICK); + AddTestCase(new BitSerializerTest, TestCase::Duration::QUICK); + AddTestCase(new BitDeserializerTest, TestCase::Duration::QUICK); } static BitSerializerTestSuite g_bitSerializerTest; //!< Static variable for test initialization diff --git a/src/network/test/buffer-test.cc b/src/network/test/buffer-test.cc index 93e201abb..bf5755f41 100644 --- a/src/network/test/buffer-test.cc +++ b/src/network/test/buffer-test.cc @@ -410,7 +410,7 @@ class BufferTestSuite : public TestSuite BufferTestSuite::BufferTestSuite() : TestSuite("buffer", UNIT) { - AddTestCase(new BufferTest, TestCase::QUICK); + AddTestCase(new BufferTest, TestCase::Duration::QUICK); } static BufferTestSuite g_bufferTestSuite; //!< Static variable for test initialization diff --git a/src/network/test/drop-tail-queue-test-suite.cc b/src/network/test/drop-tail-queue-test-suite.cc index 5d4b377c1..636f47180 100644 --- a/src/network/test/drop-tail-queue-test-suite.cc +++ b/src/network/test/drop-tail-queue-test-suite.cc @@ -99,7 +99,7 @@ class DropTailQueueTestSuite : public TestSuite DropTailQueueTestSuite() : TestSuite("drop-tail-queue", UNIT) { - AddTestCase(new DropTailQueueTestCase(), TestCase::QUICK); + AddTestCase(new DropTailQueueTestCase(), TestCase::Duration::QUICK); } }; diff --git a/src/network/test/error-model-test-suite.cc b/src/network/test/error-model-test-suite.cc index 296ab183d..f0652ab41 100644 --- a/src/network/test/error-model-test-suite.cc +++ b/src/network/test/error-model-test-suite.cc @@ -307,8 +307,8 @@ class ErrorModelTestSuite : public TestSuite ErrorModelTestSuite::ErrorModelTestSuite() : TestSuite("error-model", UNIT) { - AddTestCase(new ErrorModelSimple, TestCase::QUICK); - AddTestCase(new BurstErrorModelSimple, TestCase::QUICK); + AddTestCase(new ErrorModelSimple, TestCase::Duration::QUICK); + AddTestCase(new BurstErrorModelSimple, TestCase::Duration::QUICK); } // Do not forget to allocate an instance of this TestSuite diff --git a/src/network/test/ipv6-address-test-suite.cc b/src/network/test/ipv6-address-test-suite.cc index 0fee55d6a..d48527886 100644 --- a/src/network/test/ipv6-address-test-suite.cc +++ b/src/network/test/ipv6-address-test-suite.cc @@ -111,7 +111,7 @@ class Ipv6AddressTestSuite : public TestSuite Ipv6AddressTestSuite::Ipv6AddressTestSuite() : TestSuite("ipv6-address", UNIT) { - AddTestCase(new Ipv6AddressTestCase, TestCase::QUICK); + AddTestCase(new Ipv6AddressTestCase, TestCase::Duration::QUICK); } static Ipv6AddressTestSuite ipv6AddressTestSuite; //!< Static variable for test initialization diff --git a/src/network/test/lollipop-counter-test.cc b/src/network/test/lollipop-counter-test.cc index 926db249f..4f0dcb6ab 100644 --- a/src/network/test/lollipop-counter-test.cc +++ b/src/network/test/lollipop-counter-test.cc @@ -161,7 +161,7 @@ class LolipopCounterTestSuite : public TestSuite LolipopCounterTestSuite::LolipopCounterTestSuite() : TestSuite("lollipop-counter", UNIT) { - AddTestCase(new LollipopCounterTest(), TestCase::QUICK); + AddTestCase(new LollipopCounterTest(), TestCase::Duration::QUICK); } static LolipopCounterTestSuite diff --git a/src/network/test/packet-metadata-test.cc b/src/network/test/packet-metadata-test.cc index 217b98eae..28c903043 100644 --- a/src/network/test/packet-metadata-test.cc +++ b/src/network/test/packet-metadata-test.cc @@ -896,7 +896,7 @@ class PacketMetadataTestSuite : public TestSuite PacketMetadataTestSuite::PacketMetadataTestSuite() : TestSuite("packet-metadata", UNIT) { - AddTestCase(new PacketMetadataTest, TestCase::QUICK); + AddTestCase(new PacketMetadataTest, TestCase::Duration::QUICK); } static PacketMetadataTestSuite g_packetMetadataTest; //!< Static variable for test initialization diff --git a/src/network/test/packet-socket-apps-test-suite.cc b/src/network/test/packet-socket-apps-test-suite.cc index cae461581..78e1e3a02 100644 --- a/src/network/test/packet-socket-apps-test-suite.cc +++ b/src/network/test/packet-socket-apps-test-suite.cc @@ -132,7 +132,7 @@ class PacketSocketAppsTestSuite : public TestSuite PacketSocketAppsTestSuite() : TestSuite("packet-socket-apps", UNIT) { - AddTestCase(new PacketSocketAppsTest, TestCase::QUICK); + AddTestCase(new PacketSocketAppsTest, TestCase::Duration::QUICK); } }; diff --git a/src/network/test/packet-test-suite.cc b/src/network/test/packet-test-suite.cc index 5bd72a978..1c20fb682 100644 --- a/src/network/test/packet-test-suite.cc +++ b/src/network/test/packet-test-suite.cc @@ -1283,8 +1283,8 @@ class PacketTestSuite : public TestSuite PacketTestSuite::PacketTestSuite() : TestSuite("packet", UNIT) { - AddTestCase(new PacketTest, TestCase::QUICK); - AddTestCase(new PacketTagListTest, TestCase::QUICK); + AddTestCase(new PacketTest, TestCase::Duration::QUICK); + AddTestCase(new PacketTagListTest, TestCase::Duration::QUICK); } static PacketTestSuite g_packetTestSuite; //!< Static variable for test initialization diff --git a/src/network/test/packetbb-test-suite.cc b/src/network/test/packetbb-test-suite.cc index fca04690a..22fd1d7d9 100644 --- a/src/network/test/packetbb-test-suite.cc +++ b/src/network/test/packetbb-test-suite.cc @@ -136,7 +136,8 @@ PbbTestSuite::PbbTestSuite() { Ptr packet = Create(); uint8_t buffer[] = {0x00}; - AddTestCase(new PbbTestCase("1", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("1", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 2 @@ -152,7 +153,8 @@ PbbTestSuite::PbbTestSuite() Ptr packet = Create(); packet->SetSequenceNumber(2); uint8_t buffer[] = {0x08, 0x00, 0x02}; - AddTestCase(new PbbTestCase("2", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("2", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 3 @@ -171,7 +173,7 @@ PbbTestSuite::PbbTestSuite() Ptr packet = Create (); packet->SetSequenceNumber (3); uint8_t buffer[] = { 0x0c, 0x00, 0x03, 0x00, 0x00}; - AddTestCase (new PbbTestCase ("3", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase (new PbbTestCase ("3", packet, buffer, sizeof(buffer)), TestCase::Duration::QUICK); } #endif @@ -197,7 +199,8 @@ PbbTestSuite::PbbTestSuite() packet->TlvPushBack(tlv); uint8_t buffer[] = {0x0c, 0x00, 0x04, 0x00, 0x02, 0x01, 0x00}; - AddTestCase(new PbbTestCase("4", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("4", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 5 @@ -230,7 +233,8 @@ PbbTestSuite::PbbTestSuite() packet->TlvPushBack(tlv2); uint8_t buffer[] = {0x0c, 0x00, 0x05, 0x00, 0x05, 0x01, 0x00, 0x02, 0x80, 0x64}; - AddTestCase(new PbbTestCase("5", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("5", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 6 @@ -284,7 +288,8 @@ PbbTestSuite::PbbTestSuite() 0x03, 0x04, }; - AddTestCase(new PbbTestCase("6", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("6", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 7 @@ -443,7 +448,8 @@ PbbTestSuite::PbbTestSuite() 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, }; - AddTestCase(new PbbTestCase("7", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("7", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 8 @@ -493,7 +499,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x00, }; - AddTestCase(new PbbTestCase("8", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("8", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 9 @@ -546,7 +553,8 @@ PbbTestSuite::PbbTestSuite() 0x03, 0x00, 0x06, 0x00, 0x00, 0x02, 0x83, 0x00, /* [14] used to be 0x80 */ 0x0a, 0x0a, 0x00, 0x00, 0x01, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("9", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("9", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 10 @@ -601,7 +609,8 @@ PbbTestSuite::PbbTestSuite() 0x03, 0x00, 0x06, 0x00, 0x00, 0x02, 0xa3, 0x00, /* [14] used to be 0xa0 */ 0x0b, 0x0a, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("10", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("10", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 11 @@ -658,7 +667,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x06, 0x00, 0x00, 0x02, 0xe3, 0x00, /* [14] used to be 0xe0 */ 0x0c, 0x0a, 0x00, 0x00, 0x01, 0xff, 0x01, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("11", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("11", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 12 @@ -717,7 +727,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x00, 0x02, 0xf3, 0x00, /* [14] - 0xf0 */ 0x0e, 0x0a, 0x00, 0x00, 0x01, 0xff, 0x01, 0x30, 0x39, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("12", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("12", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 13 @@ -776,7 +787,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x00, 0x02, 0xf3, 0x00, /* [14] - 0xf0 */ 0x0e, 0x0a, 0x00, 0x00, 0x01, 0xff, 0x01, 0x30, 0x39, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("13", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("13", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 14 @@ -844,7 +856,8 @@ PbbTestSuite::PbbTestSuite() 0x08, 0x00, 0x02, 0x01, 0x00, 0x02, 0xf3, 0x00, 0x0e, 0x0a, /* [16] - 0xf0 */ 0x00, 0x00, 0x01, 0xff, 0x01, 0x30, 0x39, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("14", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("14", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 15 @@ -922,7 +935,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x00, 0x01, 0xff, 0x01, 0x30, 0x39, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("15", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("15", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 16 @@ -1000,7 +1014,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x00, 0x01, 0xff, 0x01, 0x30, 0x39, 0x00, 0x00, 0x01, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("16", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("16", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 17 @@ -1078,7 +1093,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x00, 0x01, 0xff, 0x01, 0x30, 0x39, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("17", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("17", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 18 @@ -1156,7 +1172,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x00, 0x01, 0xff, 0x01, 0x30, 0x39, 0x00, 0x00, 0x01, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("18", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("18", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 19 @@ -1234,7 +1251,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x00, 0x01, 0xff, 0x01, 0x30, 0x39, 0x00, 0x00, 0x01, 0x00, 0x0a, 0x00, 0x00, 0x01, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("19", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("19", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 20 @@ -1314,7 +1332,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x00, 0x01, 0xff, 0x01, 0x30, 0x39, 0x00, 0x00, 0x02, 0x80, 0x03, 0x0a, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("20", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("20", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 21 @@ -1394,7 +1413,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x00, 0x01, 0xff, 0x01, 0x30, 0x39, 0x00, 0x00, 0x02, 0xc0, 0x01, 0x0a, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("21", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("21", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 22 @@ -1484,7 +1504,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x00, 0x01, 0xff, 0x01, 0x30, 0x39, 0x00, 0x00, 0x02, 0xc0, 0x01, 0x0a, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x02, 0x20, 0x03, 0x0a, 0x0b, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("22", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("22", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 23 @@ -1586,7 +1607,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x05, 0x0a, 0x00, 0x00, 0x06, 0x20, 0x20, 0x10, 0x18, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("23", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("23", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 24 @@ -1695,7 +1717,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x05, 0x0a, 0x00, 0x00, 0x06, 0x20, 0x20, 0x10, 0x18, 0x00, 0x02, 0x01, 0x00, }; - AddTestCase(new PbbTestCase("24", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("24", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 25 @@ -1806,7 +1829,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x05, 0x0a, 0x00, 0x00, 0x06, 0x20, 0x20, 0x10, 0x18, 0x00, 0x03, 0x01, 0x40, 0x01, }; - AddTestCase(new PbbTestCase("25", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("25", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 26 @@ -1919,7 +1943,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x0b, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x05, 0x0a, 0x00, 0x00, 0x06, 0x20, 0x20, 0x10, 0x18, 0x00, 0x04, 0x01, 0x20, 0x01, 0x03, }; - AddTestCase(new PbbTestCase("26", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("26", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 27 @@ -2037,7 +2062,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x05, 0x0a, 0x00, 0x00, 0x06, 0x20, 0x20, 0x10, 0x18, 0x00, 0x08, 0x01, 0x34, 0x01, 0x03, 0x03, 0x01, 0x02, 0x03, }; - AddTestCase(new PbbTestCase("27", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("27", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 28 @@ -2274,7 +2300,8 @@ PbbTestSuite::PbbTestSuite() 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, }; - AddTestCase(new PbbTestCase("28", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("28", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 29 @@ -2309,7 +2336,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x00, }; - AddTestCase(new PbbTestCase("29", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("29", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 30 @@ -2341,7 +2369,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x01, 0x8f, 0x00, 0x16, 0xab, 0xcd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("30", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("30", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 31 @@ -2383,7 +2412,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("31", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("31", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 32 @@ -2427,7 +2457,8 @@ PbbTestSuite::PbbTestSuite() 0x80, 0x0f, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("32", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("32", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 33 @@ -2471,7 +2502,8 @@ PbbTestSuite::PbbTestSuite() 0xc0, 0x0d, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x11, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("33", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("33", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 34 @@ -2525,7 +2557,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x11, 0x00, 0x00, 0x02, 0xa0, 0x01, 0x00, 0x0e, 0x10, 0x11, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("34", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("34", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 35 @@ -2592,7 +2625,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x00, 0x00, 0x05, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x40, 0x30, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("35", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("35", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 36 @@ -2874,7 +2908,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x00, 0x05, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x40, 0x30, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("36", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("36", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } /* Test 37 @@ -3156,7 +3191,8 @@ PbbTestSuite::PbbTestSuite() 0x00, 0x00, 0x05, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x40, 0x30, 0x00, 0x00, }; - AddTestCase(new PbbTestCase("37", packet, buffer, sizeof(buffer)), TestCase::QUICK); + AddTestCase(new PbbTestCase("37", packet, buffer, sizeof(buffer)), + TestCase::Duration::QUICK); } } diff --git a/src/network/test/pcap-file-test-suite.cc b/src/network/test/pcap-file-test-suite.cc index b3b2651d4..5c6deaecf 100644 --- a/src/network/test/pcap-file-test-suite.cc +++ b/src/network/test/pcap-file-test-suite.cc @@ -1391,13 +1391,13 @@ PcapFileTestSuite::PcapFileTestSuite() : TestSuite("pcap-file", UNIT) { SetDataDir(NS_TEST_SOURCEDIR); - AddTestCase(new WriteModeCreateTestCase, TestCase::QUICK); - AddTestCase(new ReadModeCreateTestCase, TestCase::QUICK); - // AddTestCase (new AppendModeCreateTestCase, TestCase::QUICK); - AddTestCase(new FileHeaderTestCase, TestCase::QUICK); - AddTestCase(new RecordHeaderTestCase, TestCase::QUICK); - AddTestCase(new ReadFileTestCase, TestCase::QUICK); - AddTestCase(new DiffTestCase, TestCase::QUICK); + AddTestCase(new WriteModeCreateTestCase, TestCase::Duration::QUICK); + AddTestCase(new ReadModeCreateTestCase, TestCase::Duration::QUICK); + // AddTestCase (new AppendModeCreateTestCase, TestCase::Duration::QUICK); + AddTestCase(new FileHeaderTestCase, TestCase::Duration::QUICK); + AddTestCase(new RecordHeaderTestCase, TestCase::Duration::QUICK); + AddTestCase(new ReadFileTestCase, TestCase::Duration::QUICK); + AddTestCase(new DiffTestCase, TestCase::Duration::QUICK); } static PcapFileTestSuite pcapFileTestSuite; //!< Static variable for test initialization diff --git a/src/network/test/sequence-number-test-suite.cc b/src/network/test/sequence-number-test-suite.cc index 2c0a4f492..943c7900c 100644 --- a/src/network/test/sequence-number-test-suite.cc +++ b/src/network/test/sequence-number-test-suite.cc @@ -228,7 +228,7 @@ class SequenceNumberTestSuite : public TestSuite SequenceNumberTestSuite() : TestSuite("sequence-number", UNIT) { - AddTestCase(new SequenceNumberTestCase(), TestCase::QUICK); + AddTestCase(new SequenceNumberTestCase(), TestCase::Duration::QUICK); } }; diff --git a/src/network/test/test-data-rate.cc b/src/network/test/test-data-rate.cc index e52678f0d..4ff11da0b 100644 --- a/src/network/test/test-data-rate.cc +++ b/src/network/test/test-data-rate.cc @@ -284,8 +284,8 @@ class DataRateTestSuite : public TestSuite DataRateTestSuite::DataRateTestSuite() : TestSuite("data-rate", UNIT) { - AddTestCase(new DataRateTestCase1(), TestCase::QUICK); - AddTestCase(new DataRateTestCase2(), TestCase::QUICK); + AddTestCase(new DataRateTestCase1(), TestCase::Duration::QUICK); + AddTestCase(new DataRateTestCase2(), TestCase::Duration::QUICK); } static DataRateTestSuite sDataRateTestSuite; //!< Static variable for test initialization diff --git a/src/nix-vector-routing/test/nix-test.cc b/src/nix-vector-routing/test/nix-test.cc index c412e1403..e572a2d7a 100644 --- a/src/nix-vector-routing/test/nix-test.cc +++ b/src/nix-vector-routing/test/nix-test.cc @@ -405,7 +405,7 @@ class NixVectorRoutingTestSuite : public TestSuite NixVectorRoutingTestSuite() : TestSuite("nix-vector-routing", UNIT) { - AddTestCase(new NixVectorRoutingTest(), TestCase::QUICK); + AddTestCase(new NixVectorRoutingTest(), TestCase::Duration::QUICK); } }; diff --git a/src/olsr/test/olsr-header-test-suite.cc b/src/olsr/test/olsr-header-test-suite.cc index b83cfa745..e1bd585c2 100644 --- a/src/olsr/test/olsr-header-test-suite.cc +++ b/src/olsr/test/olsr-header-test-suite.cc @@ -341,11 +341,11 @@ class OlsrTestSuite : public TestSuite OlsrTestSuite::OlsrTestSuite() : TestSuite("routing-olsr-header", UNIT) { - AddTestCase(new OlsrHnaTestCase(), TestCase::QUICK); - AddTestCase(new OlsrTcTestCase(), TestCase::QUICK); - AddTestCase(new OlsrHelloTestCase(), TestCase::QUICK); - AddTestCase(new OlsrMidTestCase(), TestCase::QUICK); - AddTestCase(new OlsrEmfTestCase(), TestCase::QUICK); + AddTestCase(new OlsrHnaTestCase(), TestCase::Duration::QUICK); + AddTestCase(new OlsrTcTestCase(), TestCase::Duration::QUICK); + AddTestCase(new OlsrHelloTestCase(), TestCase::Duration::QUICK); + AddTestCase(new OlsrMidTestCase(), TestCase::Duration::QUICK); + AddTestCase(new OlsrEmfTestCase(), TestCase::Duration::QUICK); } static OlsrTestSuite g_olsrTestSuite; //!< Static variable for test initialization diff --git a/src/olsr/test/olsr-routing-protocol-test-suite.cc b/src/olsr/test/olsr-routing-protocol-test-suite.cc index a1e9b24bb..6b998eb87 100644 --- a/src/olsr/test/olsr-routing-protocol-test-suite.cc +++ b/src/olsr/test/olsr-routing-protocol-test-suite.cc @@ -189,7 +189,7 @@ class OlsrProtocolTestSuite : public TestSuite OlsrProtocolTestSuite::OlsrProtocolTestSuite() : TestSuite("routing-olsr", UNIT) { - AddTestCase(new OlsrMprTestCase(), TestCase::QUICK); + AddTestCase(new OlsrMprTestCase(), TestCase::Duration::QUICK); } static OlsrProtocolTestSuite g_olsrProtocolTestSuite; //!< Static variable for test initialization diff --git a/src/olsr/test/regression-test-suite.cc b/src/olsr/test/regression-test-suite.cc index 7450fa6a1..0686ab441 100644 --- a/src/olsr/test/regression-test-suite.cc +++ b/src/olsr/test/regression-test-suite.cc @@ -37,9 +37,9 @@ class RegressionTestSuite : public TestSuite : TestSuite("routing-olsr-regression", SYSTEM) { SetDataDir(NS_TEST_SOURCEDIR); - AddTestCase(new HelloRegressionTest, TestCase::QUICK); - AddTestCase(new TcRegressionTest, TestCase::QUICK); - AddTestCase(new Bug780Test, TestCase::QUICK); + AddTestCase(new HelloRegressionTest, TestCase::Duration::QUICK); + AddTestCase(new TcRegressionTest, TestCase::Duration::QUICK); + AddTestCase(new Bug780Test, TestCase::Duration::QUICK); } }; diff --git a/src/openflow/test/openflow-switch-test-suite.cc b/src/openflow/test/openflow-switch-test-suite.cc index 93eb36eff..18f7a8e8b 100644 --- a/src/openflow/test/openflow-switch-test-suite.cc +++ b/src/openflow/test/openflow-switch-test-suite.cc @@ -207,7 +207,7 @@ class SwitchTestSuite : public TestSuite SwitchTestSuite::SwitchTestSuite() : TestSuite("openflow", UNIT) { - AddTestCase(new SwitchFlowTableTestCase, TestCase::QUICK); + AddTestCase(new SwitchFlowTableTestCase, TestCase::Duration::QUICK); } /// Do not forget to allocate an instance of this TestSuite diff --git a/src/point-to-point/test/point-to-point-test.cc b/src/point-to-point/test/point-to-point-test.cc index 87bd0a0cc..7e33f18d1 100644 --- a/src/point-to-point/test/point-to-point-test.cc +++ b/src/point-to-point/test/point-to-point-test.cc @@ -154,7 +154,7 @@ class PointToPointTestSuite : public TestSuite PointToPointTestSuite::PointToPointTestSuite() : TestSuite("devices-point-to-point", UNIT) { - AddTestCase(new PointToPointTest, TestCase::QUICK); + AddTestCase(new PointToPointTest, TestCase::Duration::QUICK); } static PointToPointTestSuite g_pointToPointTestSuite; //!< The testsuite diff --git a/src/propagation/test/channel-condition-model-test-suite.cc b/src/propagation/test/channel-condition-model-test-suite.cc index dd31c00d0..7b8e244e9 100644 --- a/src/propagation/test/channel-condition-model-test-suite.cc +++ b/src/propagation/test/channel-condition-model-test-suite.cc @@ -291,7 +291,7 @@ class ChannelConditionModelsTestSuite : public TestSuite ChannelConditionModelsTestSuite::ChannelConditionModelsTestSuite() : TestSuite("propagation-channel-condition-model", UNIT) { - AddTestCase(new ThreeGppChannelConditionModelTestCase, TestCase::QUICK); + AddTestCase(new ThreeGppChannelConditionModelTestCase, TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/propagation/test/itu-r-1411-los-test-suite.cc b/src/propagation/test/itu-r-1411-los-test-suite.cc index 0329c3498..d45848e51 100644 --- a/src/propagation/test/itu-r-1411-los-test-suite.cc +++ b/src/propagation/test/itu-r-1411-los-test-suite.cc @@ -140,14 +140,14 @@ ItuR1411LosPropagationLossModelTestSuite::ItuR1411LosPropagationLossModelTestSui 1, 81.005, "freq=2114MHz, dist=100m"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ItuR1411LosPropagationLossModelTestCase(1999e6, 200, 30, 1, 87.060, "freq=1999MHz, dist=200m"), - TestCase::QUICK); + TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/propagation/test/itu-r-1411-nlos-over-rooftop-test-suite.cc b/src/propagation/test/itu-r-1411-nlos-over-rooftop-test-suite.cc index 6e21de762..ef28ec93b 100644 --- a/src/propagation/test/itu-r-1411-nlos-over-rooftop-test-suite.cc +++ b/src/propagation/test/itu-r-1411-nlos-over-rooftop-test-suite.cc @@ -158,7 +158,7 @@ ItuR1411NlosOverRooftopPropagationLossModelTestSuite:: LargeCity, 143.68, "f=2114Mhz, dist=900, urban large city"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ItuR1411NlosOverRooftopPropagationLossModelTestCase( 1.865e9, 500, @@ -168,7 +168,7 @@ ItuR1411NlosOverRooftopPropagationLossModelTestSuite:: LargeCity, 132.84, "f=2114Mhz, dist=900, urban large city"), - TestCase::QUICK); + TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/propagation/test/kun-2600-mhz-test-suite.cc b/src/propagation/test/kun-2600-mhz-test-suite.cc index 9d4f4833c..55231e28c 100644 --- a/src/propagation/test/kun-2600-mhz-test-suite.cc +++ b/src/propagation/test/kun-2600-mhz-test-suite.cc @@ -128,7 +128,7 @@ Kun2600MhzPropagationLossModelTestSuite::Kun2600MhzPropagationLossModelTestSuite LogComponentEnable("Kun2600MhzPropagationLossModelTest", LOG_LEVEL_ALL); AddTestCase(new Kun2600MhzPropagationLossModelTestCase(2000, 30, 1, 121.83, "dist=2000m"), - TestCase::QUICK); + TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/propagation/test/okumura-hata-test-suite.cc b/src/propagation/test/okumura-hata-test-suite.cc index fb8450dab..f16044911 100644 --- a/src/propagation/test/okumura-hata-test-suite.cc +++ b/src/propagation/test/okumura-hata-test-suite.cc @@ -160,7 +160,7 @@ OkumuraHataPropagationLossModelTestSuite::OkumuraHataPropagationLossModelTestSui LargeCity, 137.93, "original OH Urban Large city"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OkumuraHataPropagationLossModelTestCase(freq, 2000, 30, @@ -169,7 +169,7 @@ OkumuraHataPropagationLossModelTestSuite::OkumuraHataPropagationLossModelTestSui SmallCity, 137.88, "original OH Urban small city"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OkumuraHataPropagationLossModelTestCase(freq, 2000, 30, @@ -178,7 +178,7 @@ OkumuraHataPropagationLossModelTestSuite::OkumuraHataPropagationLossModelTestSui LargeCity, 128.03, "original OH SubUrban"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OkumuraHataPropagationLossModelTestCase(freq, 2000, 30, @@ -187,7 +187,7 @@ OkumuraHataPropagationLossModelTestSuite::OkumuraHataPropagationLossModelTestSui LargeCity, 110.21, "original OH OpenAreas"), - TestCase::QUICK); + TestCase::Duration::QUICK); freq = 2.1140e9; // this will use the extended COST231 OH model AddTestCase(new OkumuraHataPropagationLossModelTestCase(freq, @@ -198,7 +198,7 @@ OkumuraHataPropagationLossModelTestSuite::OkumuraHataPropagationLossModelTestSui LargeCity, 148.55, "COST231 OH Urban Large city"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new OkumuraHataPropagationLossModelTestCase(freq, 2000, @@ -208,7 +208,7 @@ OkumuraHataPropagationLossModelTestSuite::OkumuraHataPropagationLossModelTestSui SmallCity, 150.64, "COST231 OH Urban small city and suburban"), - TestCase::QUICK); + TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/propagation/test/probabilistic-v2v-channel-condition-model-test.cc b/src/propagation/test/probabilistic-v2v-channel-condition-model-test.cc index e5a6babd2..add514a6f 100644 --- a/src/propagation/test/probabilistic-v2v-channel-condition-model-test.cc +++ b/src/propagation/test/probabilistic-v2v-channel-condition-model-test.cc @@ -522,11 +522,11 @@ ProbabilisticV2vChCondModelsTestSuite::ProbabilisticV2vChCondModelsTestSuite() : TestSuite("probabilistic-v2v-channel-condition-model", SYSTEM) { AddTestCase(new V2vUrbanProbChCondModelTestCase, - TestCase::QUICK); // test for a fully probabilistic model (NLOS vs LOS vs NLOSv), in - // V2V urban scenario + TestCase::Duration::QUICK); // test for a fully probabilistic model (NLOS vs LOS + // vs NLOSv), in V2V urban scenario AddTestCase(new V2vHighwayProbChCondModelTestCase, - TestCase::QUICK); // test for a fully probabilistic model (NLOS vs LOS vs NLOSv), in - // V2V highway scenario*/ + TestCase::Duration::QUICK); // test for a fully probabilistic model (NLOS vs LOS + // vs NLOSv), in V2V highway scenario*/ } /// Static variable for test initialization diff --git a/src/propagation/test/propagation-loss-model-test-suite.cc b/src/propagation/test/propagation-loss-model-test-suite.cc index d4577233d..3faa6deb3 100644 --- a/src/propagation/test/propagation-loss-model-test-suite.cc +++ b/src/propagation/test/propagation-loss-model-test-suite.cc @@ -510,11 +510,11 @@ class PropagationLossModelsTestSuite : public TestSuite PropagationLossModelsTestSuite::PropagationLossModelsTestSuite() : TestSuite("propagation-loss-model", UNIT) { - AddTestCase(new FriisPropagationLossModelTestCase, TestCase::QUICK); - AddTestCase(new TwoRayGroundPropagationLossModelTestCase, TestCase::QUICK); - AddTestCase(new LogDistancePropagationLossModelTestCase, TestCase::QUICK); - AddTestCase(new MatrixPropagationLossModelTestCase, TestCase::QUICK); - AddTestCase(new RangePropagationLossModelTestCase, TestCase::QUICK); + AddTestCase(new FriisPropagationLossModelTestCase, TestCase::Duration::QUICK); + AddTestCase(new TwoRayGroundPropagationLossModelTestCase, TestCase::Duration::QUICK); + AddTestCase(new LogDistancePropagationLossModelTestCase, TestCase::Duration::QUICK); + AddTestCase(new MatrixPropagationLossModelTestCase, TestCase::Duration::QUICK); + AddTestCase(new RangePropagationLossModelTestCase, TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/propagation/test/three-gpp-propagation-loss-model-test-suite.cc b/src/propagation/test/three-gpp-propagation-loss-model-test-suite.cc index b53eda38a..00bd6813a 100644 --- a/src/propagation/test/three-gpp-propagation-loss-model-test-suite.cc +++ b/src/propagation/test/three-gpp-propagation-loss-model-test-suite.cc @@ -1327,13 +1327,13 @@ class ThreeGppPropagationLossModelsTestSuite : public TestSuite ThreeGppPropagationLossModelsTestSuite::ThreeGppPropagationLossModelsTestSuite() : TestSuite("three-gpp-propagation-loss-model", UNIT) { - AddTestCase(new ThreeGppRmaPropagationLossModelTestCase, TestCase::QUICK); - AddTestCase(new ThreeGppUmaPropagationLossModelTestCase, TestCase::QUICK); - AddTestCase(new ThreeGppUmiPropagationLossModelTestCase, TestCase::QUICK); - AddTestCase(new ThreeGppIndoorOfficePropagationLossModelTestCase, TestCase::QUICK); - AddTestCase(new ThreeGppV2vUrbanPropagationLossModelTestCase, TestCase::QUICK); - AddTestCase(new ThreeGppV2vHighwayPropagationLossModelTestCase, TestCase::QUICK); - AddTestCase(new ThreeGppShadowingTestCase, TestCase::QUICK); + AddTestCase(new ThreeGppRmaPropagationLossModelTestCase, TestCase::Duration::QUICK); + AddTestCase(new ThreeGppUmaPropagationLossModelTestCase, TestCase::Duration::QUICK); + AddTestCase(new ThreeGppUmiPropagationLossModelTestCase, TestCase::Duration::QUICK); + AddTestCase(new ThreeGppIndoorOfficePropagationLossModelTestCase, TestCase::Duration::QUICK); + AddTestCase(new ThreeGppV2vUrbanPropagationLossModelTestCase, TestCase::Duration::QUICK); + AddTestCase(new ThreeGppV2vHighwayPropagationLossModelTestCase, TestCase::Duration::QUICK); + AddTestCase(new ThreeGppShadowingTestCase, TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/sixlowpan/test/sixlowpan-fragmentation-test.cc b/src/sixlowpan/test/sixlowpan-fragmentation-test.cc index aa7ed544d..060af4031 100644 --- a/src/sixlowpan/test/sixlowpan-fragmentation-test.cc +++ b/src/sixlowpan/test/sixlowpan-fragmentation-test.cc @@ -494,7 +494,7 @@ class SixlowpanFragmentationTestSuite : public TestSuite SixlowpanFragmentationTestSuite::SixlowpanFragmentationTestSuite() : TestSuite("sixlowpan-fragmentation", UNIT) { - AddTestCase(new SixlowpanFragmentationTest(), TestCase::QUICK); + AddTestCase(new SixlowpanFragmentationTest(), TestCase::Duration::QUICK); } static SixlowpanFragmentationTestSuite diff --git a/src/sixlowpan/test/sixlowpan-hc1-test.cc b/src/sixlowpan/test/sixlowpan-hc1-test.cc index 2693ae0c5..01c75c26e 100644 --- a/src/sixlowpan/test/sixlowpan-hc1-test.cc +++ b/src/sixlowpan/test/sixlowpan-hc1-test.cc @@ -227,7 +227,7 @@ class SixlowpanHc1TestSuite : public TestSuite SixlowpanHc1TestSuite::SixlowpanHc1TestSuite() : TestSuite("sixlowpan-hc1", UNIT) { - AddTestCase(new SixlowpanHc1ImplTest(), TestCase::QUICK); + AddTestCase(new SixlowpanHc1ImplTest(), TestCase::Duration::QUICK); } static SixlowpanHc1TestSuite g_sixlowpanHc1TestSuite; //!< Static variable for test initialization diff --git a/src/sixlowpan/test/sixlowpan-iphc-stateful-test.cc b/src/sixlowpan/test/sixlowpan-iphc-stateful-test.cc index ba6f277f2..25456591e 100644 --- a/src/sixlowpan/test/sixlowpan-iphc-stateful-test.cc +++ b/src/sixlowpan/test/sixlowpan-iphc-stateful-test.cc @@ -392,7 +392,7 @@ class SixlowpanIphcStatefulTestSuite : public TestSuite SixlowpanIphcStatefulTestSuite::SixlowpanIphcStatefulTestSuite() : TestSuite("sixlowpan-iphc-stateful", UNIT) { - AddTestCase(new SixlowpanIphcStatefulImplTest(), TestCase::QUICK); + AddTestCase(new SixlowpanIphcStatefulImplTest(), TestCase::Duration::QUICK); } static SixlowpanIphcStatefulTestSuite diff --git a/src/sixlowpan/test/sixlowpan-iphc-test.cc b/src/sixlowpan/test/sixlowpan-iphc-test.cc index 312315100..18ff70eb2 100644 --- a/src/sixlowpan/test/sixlowpan-iphc-test.cc +++ b/src/sixlowpan/test/sixlowpan-iphc-test.cc @@ -225,7 +225,7 @@ class SixlowpanIphcTestSuite : public TestSuite SixlowpanIphcTestSuite::SixlowpanIphcTestSuite() : TestSuite("sixlowpan-iphc", UNIT) { - AddTestCase(new SixlowpanIphcImplTest(), TestCase::QUICK); + AddTestCase(new SixlowpanIphcImplTest(), TestCase::Duration::QUICK); } static SixlowpanIphcTestSuite g_sixlowpanIphcTestSuite; //!< Static variable for test initialization diff --git a/src/spectrum/test/spectrum-ideal-phy-test.cc b/src/spectrum/test/spectrum-ideal-phy-test.cc index 4da692f61..0b66c39b4 100644 --- a/src/spectrum/test/spectrum-ideal-phy-test.cc +++ b/src/spectrum/test/spectrum-ideal-phy-test.cc @@ -251,32 +251,32 @@ SpectrumIdealPhyTestSuite::SpectrumIdealPhyTestSuite() static_cast(achievableRate * 0.1), true, "ns3::SingleModelSpectrumChannel"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SpectrumIdealPhyTestCase(snr, static_cast(achievableRate * 0.5), true, "ns3::SingleModelSpectrumChannel"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SpectrumIdealPhyTestCase(snr, static_cast(achievableRate * 0.95), true, "ns3::SingleModelSpectrumChannel"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SpectrumIdealPhyTestCase(snr, static_cast(achievableRate * 1.05), false, "ns3::SingleModelSpectrumChannel"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SpectrumIdealPhyTestCase(snr, static_cast(achievableRate * 2), false, "ns3::SingleModelSpectrumChannel"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SpectrumIdealPhyTestCase(snr, static_cast(achievableRate * 4), false, "ns3::SingleModelSpectrumChannel"), - TestCase::QUICK); + TestCase::Duration::QUICK); } for (double snr = 0.01; snr <= 10; snr *= 10) { @@ -285,32 +285,32 @@ SpectrumIdealPhyTestSuite::SpectrumIdealPhyTestSuite() static_cast(achievableRate * 0.1), true, "ns3::MultiModelSpectrumChannel"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SpectrumIdealPhyTestCase(snr, static_cast(achievableRate * 0.5), true, "ns3::MultiModelSpectrumChannel"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SpectrumIdealPhyTestCase(snr, static_cast(achievableRate * 0.95), true, "ns3::MultiModelSpectrumChannel"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SpectrumIdealPhyTestCase(snr, static_cast(achievableRate * 1.05), false, "ns3::MultiModelSpectrumChannel"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SpectrumIdealPhyTestCase(snr, static_cast(achievableRate * 2), false, "ns3::MultiModelSpectrumChannel"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SpectrumIdealPhyTestCase(snr, static_cast(achievableRate * 4), false, "ns3::MultiModelSpectrumChannel"), - TestCase::QUICK); + TestCase::Duration::QUICK); } } diff --git a/src/spectrum/test/spectrum-interference-test.cc b/src/spectrum/test/spectrum-interference-test.cc index a151d18cb..f8cb0763c 100644 --- a/src/spectrum/test/spectrum-interference-test.cc +++ b/src/spectrum/test/spectrum-interference-test.cc @@ -184,32 +184,32 @@ SpectrumInterferenceTestSuite::SpectrumInterferenceTestSuite() (*s1)[1] = 7.204059965732e-16; b = 10067205.5632012; AddTestCase(new SpectrumInterferenceTestCase(s1, 0, true, "sdBm = [-46 -48] tx bytes: 1"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SpectrumInterferenceTestCase(s1, static_cast(b * 0.5 + 0.5), true, "sdBm = [-46 -48] tx bytes: b*0.5"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SpectrumInterferenceTestCase(s1, static_cast(b * (1 - e) + 0.5), true, "sdBm = [-46 -48] tx bytes: b*(1-e)"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SpectrumInterferenceTestCase(s1, static_cast(b * (1 + e) + 0.5), false, "sdBm = [-46 -48] tx bytes: b*(1+e)"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SpectrumInterferenceTestCase(s1, static_cast(b * 1.5 + 0.5), false, "sdBm = [-46 -48] tx bytes: b*1.5"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SpectrumInterferenceTestCase(s1, 0xffffffff, false, "sdBm = [-46 -48] tx bytes: 2^32-1"), - TestCase::QUICK); + TestCase::Duration::QUICK); // Power Spectral Density of the signal of interest = [-63 -61] dBm; Ptr s2 = Create(m); @@ -217,32 +217,32 @@ SpectrumInterferenceTestSuite::SpectrumInterferenceTestSuite() (*s2)[1] = 3.610582885110e-17; b = 882401.591840728; AddTestCase(new SpectrumInterferenceTestCase(s2, 1, true, "sdBm = [-63 -61] tx bytes: 1"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SpectrumInterferenceTestCase(s2, static_cast(b * 0.5 + 0.5), true, "sdBm = [-63 -61] tx bytes: b*0.5"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SpectrumInterferenceTestCase(s2, static_cast(b * (1 - e) + 0.5), true, "sdBm = [-63 -61] tx bytes: b*(1-e)"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SpectrumInterferenceTestCase(s2, static_cast(b * (1 + e) + 0.5), false, "sdBm = [-63 -61] tx bytes: b*(1+e)"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SpectrumInterferenceTestCase(s2, static_cast(b * 1.5 + 0.5), false, "sdBm = [-63 -61] tx bytes: b*1.5"), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new SpectrumInterferenceTestCase(s2, 0xffffffff, false, "sdBm = [-63 -61] tx bytes: 2^32-1"), - TestCase::QUICK); + TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/spectrum/test/spectrum-value-test.cc b/src/spectrum/test/spectrum-value-test.cc index 7d2104e15..1c95ae9c9 100644 --- a/src/spectrum/test/spectrum-value-test.cc +++ b/src/spectrum/test/spectrum-value-test.cc @@ -203,10 +203,10 @@ SpectrumValueTestSuite::SpectrumValueTestSuite() tv5 = v1 * v2; tv6 = v1 / v2; - AddTestCase(new SpectrumValueTestCase(tv3, v3, "tv3 = v1 + v2"), TestCase::QUICK); - AddTestCase(new SpectrumValueTestCase(tv4, v4, "tv4 = v1 - v2"), TestCase::QUICK); - AddTestCase(new SpectrumValueTestCase(tv5, v5, "tv5 = v1 * v2"), TestCase::QUICK); - AddTestCase(new SpectrumValueTestCase(tv6, v6, "tv6 = v1 div v2"), TestCase::QUICK); + AddTestCase(new SpectrumValueTestCase(tv3, v3, "tv3 = v1 + v2"), TestCase::Duration::QUICK); + AddTestCase(new SpectrumValueTestCase(tv4, v4, "tv4 = v1 - v2"), TestCase::Duration::QUICK); + AddTestCase(new SpectrumValueTestCase(tv5, v5, "tv5 = v1 * v2"), TestCase::Duration::QUICK); + AddTestCase(new SpectrumValueTestCase(tv6, v6, "tv6 = v1 div v2"), TestCase::Duration::QUICK); // std::cerr << v6 << std::endl; // std::cerr << tv6 << std::endl; @@ -221,10 +221,10 @@ SpectrumValueTestSuite::SpectrumValueTestSuite() tv5 *= v2; tv6 /= v2; - AddTestCase(new SpectrumValueTestCase(tv3, v3, "tv3 += v2"), TestCase::QUICK); - AddTestCase(new SpectrumValueTestCase(tv4, v4, "tv4 -= v2"), TestCase::QUICK); - AddTestCase(new SpectrumValueTestCase(tv5, v5, "tv5 *= v2"), TestCase::QUICK); - AddTestCase(new SpectrumValueTestCase(tv6, v6, "tv6 div= v2"), TestCase::QUICK); + AddTestCase(new SpectrumValueTestCase(tv3, v3, "tv3 += v2"), TestCase::Duration::QUICK); + AddTestCase(new SpectrumValueTestCase(tv4, v4, "tv4 -= v2"), TestCase::Duration::QUICK); + AddTestCase(new SpectrumValueTestCase(tv5, v5, "tv5 *= v2"), TestCase::Duration::QUICK); + AddTestCase(new SpectrumValueTestCase(tv6, v6, "tv6 div= v2"), TestCase::Duration::QUICK); SpectrumValue tv7a(f); SpectrumValue tv8a(f); @@ -234,11 +234,14 @@ SpectrumValueTestSuite::SpectrumValueTestSuite() tv8a = v1 - doubleValue; tv9a = v1 * doubleValue; tv10a = v1 / doubleValue; - AddTestCase(new SpectrumValueTestCase(tv7a, v7, "tv7a = v1 + doubleValue"), TestCase::QUICK); - AddTestCase(new SpectrumValueTestCase(tv8a, v8, "tv8a = v1 - doubleValue"), TestCase::QUICK); - AddTestCase(new SpectrumValueTestCase(tv9a, v9, "tv9a = v1 * doubleValue"), TestCase::QUICK); + AddTestCase(new SpectrumValueTestCase(tv7a, v7, "tv7a = v1 + doubleValue"), + TestCase::Duration::QUICK); + AddTestCase(new SpectrumValueTestCase(tv8a, v8, "tv8a = v1 - doubleValue"), + TestCase::Duration::QUICK); + AddTestCase(new SpectrumValueTestCase(tv9a, v9, "tv9a = v1 * doubleValue"), + TestCase::Duration::QUICK); AddTestCase(new SpectrumValueTestCase(tv10a, v10, "tv10a = v1 div doubleValue"), - TestCase::QUICK); + TestCase::Duration::QUICK); SpectrumValue tv7b(f); SpectrumValue tv8b(f); @@ -248,11 +251,14 @@ SpectrumValueTestSuite::SpectrumValueTestSuite() tv8b = doubleValue - v1; tv9b = doubleValue * v1; tv10b = doubleValue / v1; - AddTestCase(new SpectrumValueTestCase(tv7b, v7, "tv7b = doubleValue + v1"), TestCase::QUICK); - AddTestCase(new SpectrumValueTestCase(tv8b, v8, "tv8b = doubleValue - v1"), TestCase::QUICK); - AddTestCase(new SpectrumValueTestCase(tv9b, v9, "tv9b = doubleValue * v1"), TestCase::QUICK); + AddTestCase(new SpectrumValueTestCase(tv7b, v7, "tv7b = doubleValue + v1"), + TestCase::Duration::QUICK); + AddTestCase(new SpectrumValueTestCase(tv8b, v8, "tv8b = doubleValue - v1"), + TestCase::Duration::QUICK); + AddTestCase(new SpectrumValueTestCase(tv9b, v9, "tv9b = doubleValue * v1"), + TestCase::Duration::QUICK); AddTestCase(new SpectrumValueTestCase(tv10b, v10, "tv10b = doubleValue div v1"), - TestCase::QUICK); + TestCase::Duration::QUICK); SpectrumValue v1ls3(f); SpectrumValue v1rs3(f); @@ -262,12 +268,14 @@ SpectrumValueTestSuite::SpectrumValueTestSuite() v1ls3[0] = v1[3]; v1ls3[1] = v1[4]; tv1ls3 = v1 << 3; - AddTestCase(new SpectrumValueTestCase(tv1ls3, v1ls3, "tv1ls3 = v1 << 3"), TestCase::QUICK); + AddTestCase(new SpectrumValueTestCase(tv1ls3, v1ls3, "tv1ls3 = v1 << 3"), + TestCase::Duration::QUICK); v1rs3[3] = v1[0]; v1rs3[4] = v1[1]; tv1rs3 = v1 >> 3; - AddTestCase(new SpectrumValueTestCase(tv1rs3, v1rs3, "tv1rs3 = v1 >> 3"), TestCase::QUICK); + AddTestCase(new SpectrumValueTestCase(tv1rs3, v1rs3, "tv1rs3 = v1 >> 3"), + TestCase::Duration::QUICK); } /** @@ -314,7 +322,7 @@ SpectrumConverterTestSuite::SpectrumConverterTestSuite() // NS_LOG_LOGIC(t12); // NS_LOG_LOGIC(*res); - AddTestCase(new SpectrumValueTestCase(t12, *res, ""), TestCase::QUICK); + AddTestCase(new SpectrumValueTestCase(t12, *res, ""), TestCase::Duration::QUICK); // TEST_ASSERT(MoreOrLessEqual(t12, *res)); Ptr v2a = Create(sof2); @@ -326,7 +334,7 @@ SpectrumConverterTestSuite::SpectrumConverterTestSuite() // NS_LOG_LOGIC(*v2a); // NS_LOG_LOGIC(t21a); // NS_LOG_LOGIC(*res); - AddTestCase(new SpectrumValueTestCase(t21a, *res, ""), TestCase::QUICK); + AddTestCase(new SpectrumValueTestCase(t21a, *res, ""), TestCase::Duration::QUICK); // TEST_ASSERT(MoreOrLessEqual(t21a, *res)); Ptr v2b = Create(sof2); @@ -345,7 +353,7 @@ SpectrumConverterTestSuite::SpectrumConverterTestSuite() // NS_LOG_LOGIC(*v2b); // NS_LOG_LOGIC(t21b); // NS_LOG_LOGIC(*res); - AddTestCase(new SpectrumValueTestCase(t21b, *res, ""), TestCase::QUICK); + AddTestCase(new SpectrumValueTestCase(t21b, *res, ""), TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/spectrum/test/spectrum-waveform-generator-test.cc b/src/spectrum/test/spectrum-waveform-generator-test.cc index 2df3f3dec..001d8260d 100644 --- a/src/spectrum/test/spectrum-waveform-generator-test.cc +++ b/src/spectrum/test/spectrum-waveform-generator-test.cc @@ -132,9 +132,9 @@ WaveformGeneratorTestSuite::WaveformGeneratorTestSuite() NS_LOG_INFO("creating WaveformGeneratorTestSuite"); // Stop while wave is active - AddTestCase(new WaveformGeneratorTestCase(1.0, 0.5, 1.2), TestCase::QUICK); + AddTestCase(new WaveformGeneratorTestCase(1.0, 0.5, 1.2), TestCase::Duration::QUICK); // Stop after wave - AddTestCase(new WaveformGeneratorTestCase(1.0, 0.5, 1.7), TestCase::QUICK); + AddTestCase(new WaveformGeneratorTestCase(1.0, 0.5, 1.7), TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/spectrum/test/three-gpp-channel-test-suite.cc b/src/spectrum/test/three-gpp-channel-test-suite.cc index 247ae4dbd..011c5232c 100644 --- a/src/spectrum/test/three-gpp-channel-test-suite.cc +++ b/src/spectrum/test/three-gpp-channel-test-suite.cc @@ -1230,20 +1230,24 @@ class ThreeGppChannelTestSuite : public TestSuite ThreeGppChannelTestSuite::ThreeGppChannelTestSuite() : TestSuite("three-gpp-channel", UNIT) { - AddTestCase(new ThreeGppChannelMatrixComputationTest(2, 2, 1, 1), TestCase::QUICK); - AddTestCase(new ThreeGppChannelMatrixComputationTest(4, 2, 1, 1), TestCase::QUICK); - AddTestCase(new ThreeGppChannelMatrixComputationTest(2, 2, 2, 2), TestCase::QUICK); - AddTestCase(new ThreeGppChannelMatrixComputationTest(4, 4, 2, 2), TestCase::QUICK); - AddTestCase(new ThreeGppChannelMatrixComputationTest(4, 2, 2, 1), TestCase::QUICK); - AddTestCase(new ThreeGppChannelMatrixUpdateTest(2, 4, 1, 1), TestCase::QUICK); - AddTestCase(new ThreeGppChannelMatrixUpdateTest(2, 2, 1, 1), TestCase::QUICK); - AddTestCase(new ThreeGppChannelMatrixUpdateTest(2, 4, 2, 2), TestCase::QUICK); - AddTestCase(new ThreeGppChannelMatrixUpdateTest(2, 2, 2, 2), TestCase::QUICK); - AddTestCase(new ThreeGppSpectrumPropagationLossModelTest(4, 4, 1, 1), TestCase::QUICK); - AddTestCase(new ThreeGppSpectrumPropagationLossModelTest(4, 4, 2, 2), TestCase::QUICK); - AddTestCase(new ThreeGppSpectrumPropagationLossModelTest(4, 2, 2, 2), TestCase::QUICK); - AddTestCase(new ThreeGppSpectrumPropagationLossModelTest(4, 2, 2, 1), TestCase::QUICK); - AddTestCase(new ThreeGppCalcLongTermMultiPortTest(), TestCase::QUICK); + AddTestCase(new ThreeGppChannelMatrixComputationTest(2, 2, 1, 1), TestCase::Duration::QUICK); + AddTestCase(new ThreeGppChannelMatrixComputationTest(4, 2, 1, 1), TestCase::Duration::QUICK); + AddTestCase(new ThreeGppChannelMatrixComputationTest(2, 2, 2, 2), TestCase::Duration::QUICK); + AddTestCase(new ThreeGppChannelMatrixComputationTest(4, 4, 2, 2), TestCase::Duration::QUICK); + AddTestCase(new ThreeGppChannelMatrixComputationTest(4, 2, 2, 1), TestCase::Duration::QUICK); + AddTestCase(new ThreeGppChannelMatrixUpdateTest(2, 4, 1, 1), TestCase::Duration::QUICK); + AddTestCase(new ThreeGppChannelMatrixUpdateTest(2, 2, 1, 1), TestCase::Duration::QUICK); + AddTestCase(new ThreeGppChannelMatrixUpdateTest(2, 4, 2, 2), TestCase::Duration::QUICK); + AddTestCase(new ThreeGppChannelMatrixUpdateTest(2, 2, 2, 2), TestCase::Duration::QUICK); + AddTestCase(new ThreeGppSpectrumPropagationLossModelTest(4, 4, 1, 1), + TestCase::Duration::QUICK); + AddTestCase(new ThreeGppSpectrumPropagationLossModelTest(4, 4, 2, 2), + TestCase::Duration::QUICK); + AddTestCase(new ThreeGppSpectrumPropagationLossModelTest(4, 2, 2, 2), + TestCase::Duration::QUICK); + AddTestCase(new ThreeGppSpectrumPropagationLossModelTest(4, 2, 2, 1), + TestCase::Duration::QUICK); + AddTestCase(new ThreeGppCalcLongTermMultiPortTest(), TestCase::Duration::QUICK); /** * The TX and RX antennas are configured face-to-face. @@ -1263,7 +1267,7 @@ ThreeGppChannelTestSuite::ThreeGppChannelTestSuite() MimoPolarizationAntennaParams(false, 0, M_PI), testChannel1, 0.9), - TestCase::QUICK); + TestCase::Duration::QUICK); /** * The TX and RX antennas are configured face-to-face. @@ -1282,7 +1286,7 @@ ThreeGppChannelTestSuite::ThreeGppChannelTestSuite() MimoPolarizationAntennaParams(false, 0, M_PI), {5, 5, 3, 3, 5, 5, 3, 3, 3, 3, -5, -5, 3, 3, -5, -5}, 0.8), - TestCase::QUICK); + TestCase::Duration::QUICK); /** * The TX and RX antennas are configured face-to-face. @@ -1301,7 +1305,7 @@ ThreeGppChannelTestSuite::ThreeGppChannelTestSuite() MimoPolarizationAntennaParams(false, 0, M_PI), {4, 4, 4, 4, 4, 4, 4, 4, 4, 4, -4, -4, 4, 4, -4, -4}, 0.7), - TestCase::QUICK); + TestCase::Duration::QUICK); /** * The TX and RX antennas are configured face-to-face. @@ -1320,7 +1324,7 @@ ThreeGppChannelTestSuite::ThreeGppChannelTestSuite() MimoPolarizationAntennaParams(false, 0, M_PI), {0, 0, 5.8, 5.8, 0, 0, 5.8, 5.8, 5.9, 5.9, 0, 0, 5.9, 5.9, 0, 0}, 0.9), - TestCase::QUICK); + TestCase::Duration::QUICK); /** * The TX and RX antennas are face to face. We test the configuration of @@ -1344,7 +1348,7 @@ ThreeGppChannelTestSuite::ThreeGppChannelTestSuite() MimoPolarizationAntennaParams(false, 0, -(M_PI / 4) * 3), testChannel1, 0.9), - TestCase::QUICK); + TestCase::Duration::QUICK); /** * The TX and RX antenna have different height. @@ -1379,7 +1383,7 @@ ThreeGppChannelTestSuite::ThreeGppChannelTestSuite() {-2.4, 4}, {-2.4, 4}}, 0.5), - TestCase::QUICK); + TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/spectrum/test/tv-helper-distribution-test.cc b/src/spectrum/test/tv-helper-distribution-test.cc index 7cca83b17..c03c993fc 100644 --- a/src/spectrum/test/tv-helper-distribution-test.cc +++ b/src/spectrum/test/tv-helper-distribution-test.cc @@ -149,7 +149,8 @@ TvHelperDistributionTestSuite::TvHelperDistributionTestSuite() NS_LOG_INFO("creating TvHelperDistributionTestSuite"); for (uint32_t maxNumTransmitters = 3; maxNumTransmitters <= 203; maxNumTransmitters += 10) { - AddTestCase(new TvHelperDistributionTestCase(maxNumTransmitters), TestCase::QUICK); + AddTestCase(new TvHelperDistributionTestCase(maxNumTransmitters), + TestCase::Duration::QUICK); } } diff --git a/src/spectrum/test/tv-spectrum-transmitter-test.cc b/src/spectrum/test/tv-spectrum-transmitter-test.cc index ec6b553ff..55b81a125 100644 --- a/src/spectrum/test/tv-spectrum-transmitter-test.cc +++ b/src/spectrum/test/tv-spectrum-transmitter-test.cc @@ -194,7 +194,7 @@ TvSpectrumTransmitterTestSuite::TvSpectrumTransmitterTestSuite() bandwidth, psd, TvSpectrumTransmitter::TVTYPE_8VSB), - TestCase::QUICK); + TestCase::Duration::QUICK); } } } @@ -208,7 +208,7 @@ TvSpectrumTransmitterTestSuite::TvSpectrumTransmitterTestSuite() bandwidth, psd, TvSpectrumTransmitter::TVTYPE_COFDM), - TestCase::QUICK); + TestCase::Duration::QUICK); } } } @@ -222,7 +222,7 @@ TvSpectrumTransmitterTestSuite::TvSpectrumTransmitterTestSuite() bandwidth, psd, TvSpectrumTransmitter::TVTYPE_ANALOG), - TestCase::QUICK); + TestCase::Duration::QUICK); } } } diff --git a/src/spectrum/test/two-ray-splm-test-suite.cc b/src/spectrum/test/two-ray-splm-test-suite.cc index b13369609..ce09c3238 100644 --- a/src/spectrum/test/two-ray-splm-test-suite.cc +++ b/src/spectrum/test/two-ray-splm-test-suite.cc @@ -600,7 +600,7 @@ TwoRaySplmTestSuite::TwoRaySplmTestSuite() : TestSuite("two-ray-splm-suite", UNIT) { // Test the GetFtrFastFading function of the TwoRaySpectrumPropagationLossModel class - AddTestCase(new FtrFadingModelAverageTest, TestCase::QUICK); + AddTestCase(new FtrFadingModelAverageTest, TestCase::Duration::QUICK); // Test the CalcBeamformingGain function of the TwoRaySpectrumPropagationLossModel class auto iso = CreateObject(); @@ -621,7 +621,7 @@ TwoRaySplmTestSuite::TwoRaySplmTestSuite() 0.0, -M_PI, 0.0), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ArrayResponseTest(iso, iso, 4, @@ -631,7 +631,7 @@ TwoRaySplmTestSuite::TwoRaySplmTestSuite() 0.0, -M_PI, 10 * log10(4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ArrayResponseTest(iso, iso, 16, @@ -641,7 +641,7 @@ TwoRaySplmTestSuite::TwoRaySplmTestSuite() 0.0, -M_PI, 10 * log10(16)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ArrayResponseTest(iso, iso, 64, @@ -651,7 +651,7 @@ TwoRaySplmTestSuite::TwoRaySplmTestSuite() 0.0, -M_PI, 10 * log10(64)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ArrayResponseTest(iso, iso, 4, @@ -661,7 +661,7 @@ TwoRaySplmTestSuite::TwoRaySplmTestSuite() 0.0, -M_PI, 2 * 10 * log10(4)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ArrayResponseTest(iso, iso, 16, @@ -671,7 +671,7 @@ TwoRaySplmTestSuite::TwoRaySplmTestSuite() 0.0, -M_PI, 2 * 10 * log10(16)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ArrayResponseTest(iso, iso, 64, @@ -681,7 +681,7 @@ TwoRaySplmTestSuite::TwoRaySplmTestSuite() 0.0, -M_PI, 2 * 10 * log10(64)), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ArrayResponseTest(tgpp, iso, 1, @@ -691,7 +691,7 @@ TwoRaySplmTestSuite::TwoRaySplmTestSuite() 0.0, -M_PI, maxTgppGain), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ArrayResponseTest(tgpp, iso, 4, @@ -701,7 +701,7 @@ TwoRaySplmTestSuite::TwoRaySplmTestSuite() 0.0, -M_PI, 10 * log10(4) + maxTgppGain), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ArrayResponseTest(tgpp, iso, 16, @@ -711,7 +711,7 @@ TwoRaySplmTestSuite::TwoRaySplmTestSuite() 0.0, -M_PI, 10 * log10(16) + maxTgppGain), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ArrayResponseTest(tgpp, iso, 64, @@ -721,7 +721,7 @@ TwoRaySplmTestSuite::TwoRaySplmTestSuite() 0.0, -M_PI, 10 * log10(64) + maxTgppGain), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ArrayResponseTest(tgpp, tgpp, 1, @@ -731,7 +731,7 @@ TwoRaySplmTestSuite::TwoRaySplmTestSuite() 0.0, -M_PI, 2 * maxTgppGain), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ArrayResponseTest(tgpp, tgpp, 4, @@ -741,7 +741,7 @@ TwoRaySplmTestSuite::TwoRaySplmTestSuite() 0.0, -M_PI, 10 * log10(4) + 2 * maxTgppGain), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ArrayResponseTest(tgpp, tgpp, 16, @@ -751,7 +751,7 @@ TwoRaySplmTestSuite::TwoRaySplmTestSuite() 0.0, -M_PI, 10 * log10(16) + 2 * maxTgppGain), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ArrayResponseTest(tgpp, tgpp, 64, @@ -761,7 +761,7 @@ TwoRaySplmTestSuite::TwoRaySplmTestSuite() 0.0, -M_PI, 10 * log10(64) + 2 * maxTgppGain), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ArrayResponseTest(tgpp, tgpp, 4, @@ -771,7 +771,7 @@ TwoRaySplmTestSuite::TwoRaySplmTestSuite() 0.0, -M_PI, 2 * 10 * log10(4) + 2 * maxTgppGain), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ArrayResponseTest(tgpp, tgpp, 16, @@ -781,7 +781,7 @@ TwoRaySplmTestSuite::TwoRaySplmTestSuite() 0.0, -M_PI, 2 * 10 * log10(16) + 2 * maxTgppGain), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new ArrayResponseTest(tgpp, tgpp, 64, @@ -791,44 +791,52 @@ TwoRaySplmTestSuite::TwoRaySplmTestSuite() 0.0, -M_PI, 2 * 10 * log10(64) + 2 * maxTgppGain), - TestCase::QUICK); + TestCase::Duration::QUICK); // Deploy 2 squared antenna arrays which face each other. Steer their beam towards the boresight // and check the overall resulting channel gain. SE = single element radiation pattern, N = // number of radiating elements, Fc = carrier frequency, Scen = 3GPP scenario // SE tx, SE rx, N tx, N rx, Fc, Scen - AddTestCase(new OverallGainAverageTest(iso, iso, 1, 1, 10e9, "RMa"), TestCase::EXTENSIVE); - AddTestCase(new OverallGainAverageTest(tgpp, tgpp, 1, 1, 10e9, "RMa"), TestCase::EXTENSIVE); - AddTestCase(new OverallGainAverageTest(iso, iso, 4, 4, 10e9, "RMa"), TestCase::EXTENSIVE); - AddTestCase(new OverallGainAverageTest(tgpp, tgpp, 4, 4, 10e9, "RMa"), TestCase::EXTENSIVE); - AddTestCase(new OverallGainAverageTest(iso, iso, 1, 1, 10e9, "UMa"), TestCase::EXTENSIVE); - AddTestCase(new OverallGainAverageTest(tgpp, tgpp, 1, 1, 10e9, "UMa"), TestCase::EXTENSIVE); - AddTestCase(new OverallGainAverageTest(iso, iso, 4, 4, 10e9, "UMa"), TestCase::EXTENSIVE); - AddTestCase(new OverallGainAverageTest(tgpp, tgpp, 4, 4, 10e9, "UMa"), TestCase::EXTENSIVE); + AddTestCase(new OverallGainAverageTest(iso, iso, 1, 1, 10e9, "RMa"), + TestCase::Duration::EXTENSIVE); + AddTestCase(new OverallGainAverageTest(tgpp, tgpp, 1, 1, 10e9, "RMa"), + TestCase::Duration::EXTENSIVE); + AddTestCase(new OverallGainAverageTest(iso, iso, 4, 4, 10e9, "RMa"), + TestCase::Duration::EXTENSIVE); + AddTestCase(new OverallGainAverageTest(tgpp, tgpp, 4, 4, 10e9, "RMa"), + TestCase::Duration::EXTENSIVE); + AddTestCase(new OverallGainAverageTest(iso, iso, 1, 1, 10e9, "UMa"), + TestCase::Duration::EXTENSIVE); + AddTestCase(new OverallGainAverageTest(tgpp, tgpp, 1, 1, 10e9, "UMa"), + TestCase::Duration::EXTENSIVE); + AddTestCase(new OverallGainAverageTest(iso, iso, 4, 4, 10e9, "UMa"), + TestCase::Duration::EXTENSIVE); + AddTestCase(new OverallGainAverageTest(tgpp, tgpp, 4, 4, 10e9, "UMa"), + TestCase::Duration::EXTENSIVE); AddTestCase(new OverallGainAverageTest(iso, iso, 1, 1, 60e9, "UMi-StreetCanyon"), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new OverallGainAverageTest(tgpp, tgpp, 1, 1, 60e9, "UMi-StreetCanyon"), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new OverallGainAverageTest(iso, iso, 4, 4, 60e9, "UMi-StreetCanyon"), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new OverallGainAverageTest(tgpp, tgpp, 4, 4, 60e9, "UMi-StreetCanyon"), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new OverallGainAverageTest(iso, iso, 1, 1, 60e9, "InH-OfficeOpen"), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new OverallGainAverageTest(tgpp, tgpp, 1, 1, 60e9, "InH-OfficeOpen"), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new OverallGainAverageTest(iso, iso, 4, 4, 60e9, "InH-OfficeOpen"), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new OverallGainAverageTest(tgpp, tgpp, 4, 4, 60e9, "InH-OfficeOpen"), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new OverallGainAverageTest(iso, iso, 1, 1, 100e9, "InH-OfficeMixed"), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new OverallGainAverageTest(tgpp, tgpp, 1, 1, 100e9, "InH-OfficeMixed"), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new OverallGainAverageTest(iso, iso, 4, 4, 100e9, "InH-OfficeMixed"), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); AddTestCase(new OverallGainAverageTest(tgpp, tgpp, 4, 4, 100e9, "InH-OfficeMixed"), - TestCase::EXTENSIVE); + TestCase::Duration::EXTENSIVE); } // Static variable for test initialization diff --git a/src/stats/test/average-test-suite.cc b/src/stats/test/average-test-suite.cc index b2737e01a..cc76a0154 100644 --- a/src/stats/test/average-test-suite.cc +++ b/src/stats/test/average-test-suite.cc @@ -319,9 +319,9 @@ class AverageTestSuite : public TestSuite AverageTestSuite::AverageTestSuite() : TestSuite("average", UNIT) { - AddTestCase(new OneIntegerAverageTestCase, TestCase::QUICK); - AddTestCase(new FiveIntegersAverageTestCase, TestCase::QUICK); - AddTestCase(new FiveDoublesAverageTestCase, TestCase::QUICK); + AddTestCase(new OneIntegerAverageTestCase, TestCase::Duration::QUICK); + AddTestCase(new FiveIntegersAverageTestCase, TestCase::Duration::QUICK); + AddTestCase(new FiveDoublesAverageTestCase, TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/stats/test/basic-data-calculators-test-suite.cc b/src/stats/test/basic-data-calculators-test-suite.cc index 0616be901..7073809b2 100644 --- a/src/stats/test/basic-data-calculators-test-suite.cc +++ b/src/stats/test/basic-data-calculators-test-suite.cc @@ -263,9 +263,9 @@ class BasicDataCalculatorsTestSuite : public TestSuite BasicDataCalculatorsTestSuite::BasicDataCalculatorsTestSuite() : TestSuite("basic-data-calculators", UNIT) { - AddTestCase(new OneIntegerTestCase, TestCase::QUICK); - AddTestCase(new FiveIntegersTestCase, TestCase::QUICK); - AddTestCase(new FiveDoublesTestCase, TestCase::QUICK); + AddTestCase(new OneIntegerTestCase, TestCase::Duration::QUICK); + AddTestCase(new FiveIntegersTestCase, TestCase::Duration::QUICK); + AddTestCase(new FiveDoublesTestCase, TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/stats/test/double-probe-test-suite.cc b/src/stats/test/double-probe-test-suite.cc index e6bb723a2..de041c8d2 100644 --- a/src/stats/test/double-probe-test-suite.cc +++ b/src/stats/test/double-probe-test-suite.cc @@ -212,7 +212,7 @@ class ProbeTestSuite : public TestSuite ProbeTestSuite::ProbeTestSuite() : TestSuite("double-probe", UNIT) { - AddTestCase(new ProbeTestCase1, TestCase::QUICK); + AddTestCase(new ProbeTestCase1, TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/stats/test/histogram-test-suite.cc b/src/stats/test/histogram-test-suite.cc index 93db17014..7b06eebcb 100644 --- a/src/stats/test/histogram-test-suite.cc +++ b/src/stats/test/histogram-test-suite.cc @@ -85,7 +85,7 @@ class HistogramTestSuite : public TestSuite HistogramTestSuite::HistogramTestSuite() : TestSuite("histogram", UNIT) { - AddTestCase(new HistogramTestCase, TestCase::QUICK); + AddTestCase(new HistogramTestCase, TestCase::Duration::QUICK); } static HistogramTestSuite g_HistogramTestSuite; //!< Static variable for test initialization diff --git a/src/test/csma-system-test-suite.cc b/src/test/csma-system-test-suite.cc index bc8c3977d..088fa6954 100644 --- a/src/test/csma-system-test-suite.cc +++ b/src/test/csma-system-test-suite.cc @@ -1245,14 +1245,14 @@ class CsmaSystemTestSuite : public TestSuite CsmaSystemTestSuite::CsmaSystemTestSuite() : TestSuite("csma-system", UNIT) { - AddTestCase(new CsmaBridgeTestCase, TestCase::QUICK); - AddTestCase(new CsmaBroadcastTestCase, TestCase::QUICK); - AddTestCase(new CsmaMulticastTestCase, TestCase::QUICK); - AddTestCase(new CsmaOneSubnetTestCase, TestCase::QUICK); - AddTestCase(new CsmaPacketSocketTestCase, TestCase::QUICK); - AddTestCase(new CsmaPingTestCase, TestCase::QUICK); - AddTestCase(new CsmaRawIpSocketTestCase, TestCase::QUICK); - AddTestCase(new CsmaStarTestCase, TestCase::QUICK); + AddTestCase(new CsmaBridgeTestCase, TestCase::Duration::QUICK); + AddTestCase(new CsmaBroadcastTestCase, TestCase::Duration::QUICK); + AddTestCase(new CsmaMulticastTestCase, TestCase::Duration::QUICK); + AddTestCase(new CsmaOneSubnetTestCase, TestCase::Duration::QUICK); + AddTestCase(new CsmaPacketSocketTestCase, TestCase::Duration::QUICK); + AddTestCase(new CsmaPingTestCase, TestCase::Duration::QUICK); + AddTestCase(new CsmaRawIpSocketTestCase, TestCase::Duration::QUICK); + AddTestCase(new CsmaStarTestCase, TestCase::Duration::QUICK); } /// Do not forget to allocate an instance of this TestSuite diff --git a/src/test/ns3tc/fq-cobalt-queue-disc-test-suite.cc b/src/test/ns3tc/fq-cobalt-queue-disc-test-suite.cc index e053c6195..f45c1a6e5 100644 --- a/src/test/ns3tc/fq-cobalt-queue-disc-test-suite.cc +++ b/src/test/ns3tc/fq-cobalt-queue-disc-test-suite.cc @@ -1720,14 +1720,14 @@ class FqCobaltQueueDiscTestSuite : public TestSuite FqCobaltQueueDiscTestSuite::FqCobaltQueueDiscTestSuite() : TestSuite("fq-cobalt-queue-disc", UNIT) { - AddTestCase(new FqCobaltQueueDiscNoSuitableFilter, TestCase::QUICK); - AddTestCase(new FqCobaltQueueDiscIPFlowsSeparationAndPacketLimit, TestCase::QUICK); - AddTestCase(new FqCobaltQueueDiscDeficit, TestCase::QUICK); - AddTestCase(new FqCobaltQueueDiscTCPFlowsSeparation, TestCase::QUICK); - AddTestCase(new FqCobaltQueueDiscUDPFlowsSeparation, TestCase::QUICK); - AddTestCase(new FqCobaltQueueDiscEcnMarking, TestCase::QUICK); - AddTestCase(new FqCobaltQueueDiscSetLinearProbing, TestCase::QUICK); - AddTestCase(new FqCobaltQueueDiscL4sMode, TestCase::QUICK); + AddTestCase(new FqCobaltQueueDiscNoSuitableFilter, TestCase::Duration::QUICK); + AddTestCase(new FqCobaltQueueDiscIPFlowsSeparationAndPacketLimit, TestCase::Duration::QUICK); + AddTestCase(new FqCobaltQueueDiscDeficit, TestCase::Duration::QUICK); + AddTestCase(new FqCobaltQueueDiscTCPFlowsSeparation, TestCase::Duration::QUICK); + AddTestCase(new FqCobaltQueueDiscUDPFlowsSeparation, TestCase::Duration::QUICK); + AddTestCase(new FqCobaltQueueDiscEcnMarking, TestCase::Duration::QUICK); + AddTestCase(new FqCobaltQueueDiscSetLinearProbing, TestCase::Duration::QUICK); + AddTestCase(new FqCobaltQueueDiscL4sMode, TestCase::Duration::QUICK); } /// Do not forget to allocate an instance of this TestSuite. diff --git a/src/test/ns3tc/fq-codel-queue-disc-test-suite.cc b/src/test/ns3tc/fq-codel-queue-disc-test-suite.cc index a81bdbedf..a88cc1c0e 100644 --- a/src/test/ns3tc/fq-codel-queue-disc-test-suite.cc +++ b/src/test/ns3tc/fq-codel-queue-disc-test-suite.cc @@ -1770,14 +1770,14 @@ class FqCoDelQueueDiscTestSuite : public TestSuite FqCoDelQueueDiscTestSuite::FqCoDelQueueDiscTestSuite() : TestSuite("fq-codel-queue-disc", UNIT) { - AddTestCase(new FqCoDelQueueDiscNoSuitableFilter, TestCase::QUICK); - AddTestCase(new FqCoDelQueueDiscIPFlowsSeparationAndPacketLimit, TestCase::QUICK); - AddTestCase(new FqCoDelQueueDiscDeficit, TestCase::QUICK); - AddTestCase(new FqCoDelQueueDiscTCPFlowsSeparation, TestCase::QUICK); - AddTestCase(new FqCoDelQueueDiscUDPFlowsSeparation, TestCase::QUICK); - AddTestCase(new FqCoDelQueueDiscECNMarking, TestCase::QUICK); - AddTestCase(new FqCoDelQueueDiscSetLinearProbing, TestCase::QUICK); - AddTestCase(new FqCoDelQueueDiscL4sMode, TestCase::QUICK); + AddTestCase(new FqCoDelQueueDiscNoSuitableFilter, TestCase::Duration::QUICK); + AddTestCase(new FqCoDelQueueDiscIPFlowsSeparationAndPacketLimit, TestCase::Duration::QUICK); + AddTestCase(new FqCoDelQueueDiscDeficit, TestCase::Duration::QUICK); + AddTestCase(new FqCoDelQueueDiscTCPFlowsSeparation, TestCase::Duration::QUICK); + AddTestCase(new FqCoDelQueueDiscUDPFlowsSeparation, TestCase::Duration::QUICK); + AddTestCase(new FqCoDelQueueDiscECNMarking, TestCase::Duration::QUICK); + AddTestCase(new FqCoDelQueueDiscSetLinearProbing, TestCase::Duration::QUICK); + AddTestCase(new FqCoDelQueueDiscL4sMode, TestCase::Duration::QUICK); } /// Do not forget to allocate an instance of this TestSuite. diff --git a/src/test/ns3tc/fq-pie-queue-disc-test-suite.cc b/src/test/ns3tc/fq-pie-queue-disc-test-suite.cc index 13ee95b24..7e0635732 100644 --- a/src/test/ns3tc/fq-pie-queue-disc-test-suite.cc +++ b/src/test/ns3tc/fq-pie-queue-disc-test-suite.cc @@ -1162,13 +1162,13 @@ class FqPieQueueDiscTestSuite : public TestSuite FqPieQueueDiscTestSuite::FqPieQueueDiscTestSuite() : TestSuite("fq-pie-queue-disc", UNIT) { - AddTestCase(new FqPieQueueDiscNoSuitableFilter, TestCase::QUICK); - AddTestCase(new FqPieQueueDiscIPFlowsSeparationAndPacketLimit, TestCase::QUICK); - AddTestCase(new FqPieQueueDiscDeficit, TestCase::QUICK); - AddTestCase(new FqPieQueueDiscTCPFlowsSeparation, TestCase::QUICK); - AddTestCase(new FqPieQueueDiscUDPFlowsSeparation, TestCase::QUICK); - AddTestCase(new FqPieQueueDiscSetLinearProbing, TestCase::QUICK); - AddTestCase(new FqPieQueueDiscL4sMode, TestCase::QUICK); + AddTestCase(new FqPieQueueDiscNoSuitableFilter, TestCase::Duration::QUICK); + AddTestCase(new FqPieQueueDiscIPFlowsSeparationAndPacketLimit, TestCase::Duration::QUICK); + AddTestCase(new FqPieQueueDiscDeficit, TestCase::Duration::QUICK); + AddTestCase(new FqPieQueueDiscTCPFlowsSeparation, TestCase::Duration::QUICK); + AddTestCase(new FqPieQueueDiscUDPFlowsSeparation, TestCase::Duration::QUICK); + AddTestCase(new FqPieQueueDiscSetLinearProbing, TestCase::Duration::QUICK); + AddTestCase(new FqPieQueueDiscL4sMode, TestCase::Duration::QUICK); } /// Do not forget to allocate an instance of this TestSuite. diff --git a/src/test/ns3tc/pfifo-fast-queue-disc-test-suite.cc b/src/test/ns3tc/pfifo-fast-queue-disc-test-suite.cc index 25d3dda0e..512875686 100644 --- a/src/test/ns3tc/pfifo-fast-queue-disc-test-suite.cc +++ b/src/test/ns3tc/pfifo-fast-queue-disc-test-suite.cc @@ -399,10 +399,10 @@ class PfifoFastQueueDiscTestSuite : public TestSuite PfifoFastQueueDiscTestSuite::PfifoFastQueueDiscTestSuite() : TestSuite("pfifo-fast-queue-disc", UNIT) { - AddTestCase(new PfifoFastQueueDiscTosPrioritization, TestCase::QUICK); - AddTestCase(new PfifoFastQueueDiscDscpPrioritization, TestCase::QUICK); - AddTestCase(new PfifoFastQueueDiscOverflow, TestCase::QUICK); - AddTestCase(new PfifoFastQueueDiscNoPriority, TestCase::QUICK); + AddTestCase(new PfifoFastQueueDiscTosPrioritization, TestCase::Duration::QUICK); + AddTestCase(new PfifoFastQueueDiscDscpPrioritization, TestCase::Duration::QUICK); + AddTestCase(new PfifoFastQueueDiscOverflow, TestCase::Duration::QUICK); + AddTestCase(new PfifoFastQueueDiscNoPriority, TestCase::Duration::QUICK); } /// Do not forget to allocate an instance of this TestSuite. diff --git a/src/test/ns3tcp/ns3tcp-cubic-test-suite.cc b/src/test/ns3tcp/ns3tcp-cubic-test-suite.cc index a05a789d4..5491b9215 100644 --- a/src/test/ns3tcp/ns3tcp-cubic-test-suite.cc +++ b/src/test/ns3tcp/ns3tcp-cubic-test-suite.cc @@ -423,7 +423,7 @@ Ns3TcpCubicTestSuite::Ns3TcpCubicTestSuite() false, MilliSeconds(5), false), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test Cubic with fast convergence but no TCP friendliness enabled // This results in a cwnd plot that has concave and convex regions, as @@ -434,7 +434,7 @@ Ns3TcpCubicTestSuite::Ns3TcpCubicTestSuite() false, MilliSeconds(5), false), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test Cubic with fast convergence but no TCP friendliness enabled // with a higher RTT (20ms) and a step change in capacity at time 10s. @@ -445,7 +445,7 @@ Ns3TcpCubicTestSuite::Ns3TcpCubicTestSuite() false, MilliSeconds(20), true), - TestCase::QUICK); + TestCase::Duration::QUICK); // Test Cubic with fast convergence but with TCP friendliness enabled // with a higher RTT (20ms) and a step change in capacity at time 10s. @@ -456,7 +456,7 @@ Ns3TcpCubicTestSuite::Ns3TcpCubicTestSuite() true, MilliSeconds(20), true), - TestCase::QUICK); + TestCase::Duration::QUICK); } /** diff --git a/src/test/ns3tcp/ns3tcp-loss-test-suite.cc b/src/test/ns3tcp/ns3tcp-loss-test-suite.cc index 9f9d96119..029096683 100644 --- a/src/test/ns3tcp/ns3tcp-loss-test-suite.cc +++ b/src/test/ns3tcp/ns3tcp-loss-test-suite.cc @@ -516,17 +516,17 @@ Ns3TcpLossTestSuite::Ns3TcpLossTestSuite() SetDataDir("src/test/ns3tcp/response-vectors"); Packet::EnablePrinting(); // Enable packet metadata for all test cases - AddTestCase(new Ns3TcpLossTestCase("NewReno", 0), TestCase::QUICK); - AddTestCase(new Ns3TcpLossTestCase("NewReno", 1), TestCase::QUICK); - AddTestCase(new Ns3TcpLossTestCase("NewReno", 2), TestCase::QUICK); - AddTestCase(new Ns3TcpLossTestCase("NewReno", 3), TestCase::QUICK); - AddTestCase(new Ns3TcpLossTestCase("NewReno", 4), TestCase::QUICK); + AddTestCase(new Ns3TcpLossTestCase("NewReno", 0), TestCase::Duration::QUICK); + AddTestCase(new Ns3TcpLossTestCase("NewReno", 1), TestCase::Duration::QUICK); + AddTestCase(new Ns3TcpLossTestCase("NewReno", 2), TestCase::Duration::QUICK); + AddTestCase(new Ns3TcpLossTestCase("NewReno", 3), TestCase::Duration::QUICK); + AddTestCase(new Ns3TcpLossTestCase("NewReno", 4), TestCase::Duration::QUICK); - AddTestCase(new Ns3TcpLossTestCase("WestwoodPlus", 0), TestCase::QUICK); - AddTestCase(new Ns3TcpLossTestCase("WestwoodPlus", 1), TestCase::QUICK); - AddTestCase(new Ns3TcpLossTestCase("WestwoodPlus", 2), TestCase::QUICK); - AddTestCase(new Ns3TcpLossTestCase("WestwoodPlus", 3), TestCase::QUICK); - AddTestCase(new Ns3TcpLossTestCase("WestwoodPlus", 4), TestCase::QUICK); + AddTestCase(new Ns3TcpLossTestCase("WestwoodPlus", 0), TestCase::Duration::QUICK); + AddTestCase(new Ns3TcpLossTestCase("WestwoodPlus", 1), TestCase::Duration::QUICK); + AddTestCase(new Ns3TcpLossTestCase("WestwoodPlus", 2), TestCase::Duration::QUICK); + AddTestCase(new Ns3TcpLossTestCase("WestwoodPlus", 3), TestCase::Duration::QUICK); + AddTestCase(new Ns3TcpLossTestCase("WestwoodPlus", 4), TestCase::Duration::QUICK); } /// Do not forget to allocate an instance of this TestSuite. diff --git a/src/test/ns3tcp/ns3tcp-no-delay-test-suite.cc b/src/test/ns3tcp/ns3tcp-no-delay-test-suite.cc index d56eda6f0..9a815b226 100644 --- a/src/test/ns3tcp/ns3tcp-no-delay-test-suite.cc +++ b/src/test/ns3tcp/ns3tcp-no-delay-test-suite.cc @@ -225,8 +225,8 @@ class Ns3TcpNoDelayTestSuite : public TestSuite Ns3TcpNoDelayTestSuite::Ns3TcpNoDelayTestSuite() : TestSuite("ns3-tcp-no-delay", SYSTEM) { - AddTestCase(new Ns3TcpNoDelayTestCase(true), TestCase::QUICK); - AddTestCase(new Ns3TcpNoDelayTestCase(false), TestCase::QUICK); + AddTestCase(new Ns3TcpNoDelayTestCase(true), TestCase::Duration::QUICK); + AddTestCase(new Ns3TcpNoDelayTestCase(false), TestCase::Duration::QUICK); } /// Do not forget to allocate an instance of this TestSuite. diff --git a/src/test/ns3tcp/ns3tcp-socket-test-suite.cc b/src/test/ns3tcp/ns3tcp-socket-test-suite.cc index 35ab152e8..62966c9df 100644 --- a/src/test/ns3tcp/ns3tcp-socket-test-suite.cc +++ b/src/test/ns3tcp/ns3tcp-socket-test-suite.cc @@ -311,8 +311,8 @@ class Ns3TcpSocketTestSuite : public TestSuite Ns3TcpSocketTestSuite::Ns3TcpSocketTestSuite() : TestSuite("ns3-tcp-socket", SYSTEM) { - AddTestCase(new Ns3TcpSocketTestCaseP2P, TestCase::QUICK); - AddTestCase(new Ns3TcpSocketTestCaseCsma, TestCase::QUICK); + AddTestCase(new Ns3TcpSocketTestCaseP2P, TestCase::Duration::QUICK); + AddTestCase(new Ns3TcpSocketTestCaseCsma, TestCase::Duration::QUICK); } /// Do not forget to allocate an instance of this TestSuite. diff --git a/src/test/ns3tcp/ns3tcp-state-test-suite.cc b/src/test/ns3tcp/ns3tcp-state-test-suite.cc index 3da311d1c..f190bfdb1 100644 --- a/src/test/ns3tcp/ns3tcp-state-test-suite.cc +++ b/src/test/ns3tcp/ns3tcp-state-test-suite.cc @@ -537,15 +537,15 @@ Ns3TcpStateTestSuite::Ns3TcpStateTestSuite() SetDataDir("src/test/ns3tcp/response-vectors"); Packet::EnablePrinting(); // Enable packet metadata for all test cases - AddTestCase(new Ns3TcpStateTestCase(0), TestCase::QUICK); - AddTestCase(new Ns3TcpStateTestCase(1), TestCase::QUICK); - AddTestCase(new Ns3TcpStateTestCase(2), TestCase::QUICK); - AddTestCase(new Ns3TcpStateTestCase(3), TestCase::QUICK); - AddTestCase(new Ns3TcpStateTestCase(4), TestCase::QUICK); - AddTestCase(new Ns3TcpStateTestCase(5), TestCase::QUICK); - AddTestCase(new Ns3TcpStateTestCase(6), TestCase::QUICK); - AddTestCase(new Ns3TcpStateTestCase(7), TestCase::QUICK); - AddTestCase(new Ns3TcpStateTestCase(8), TestCase::QUICK); + AddTestCase(new Ns3TcpStateTestCase(0), TestCase::Duration::QUICK); + AddTestCase(new Ns3TcpStateTestCase(1), TestCase::Duration::QUICK); + AddTestCase(new Ns3TcpStateTestCase(2), TestCase::Duration::QUICK); + AddTestCase(new Ns3TcpStateTestCase(3), TestCase::Duration::QUICK); + AddTestCase(new Ns3TcpStateTestCase(4), TestCase::Duration::QUICK); + AddTestCase(new Ns3TcpStateTestCase(5), TestCase::Duration::QUICK); + AddTestCase(new Ns3TcpStateTestCase(6), TestCase::Duration::QUICK); + AddTestCase(new Ns3TcpStateTestCase(7), TestCase::Duration::QUICK); + AddTestCase(new Ns3TcpStateTestCase(8), TestCase::Duration::QUICK); } /// Do not forget to allocate an instance of this TestSuite. diff --git a/src/test/ns3wifi/wifi-ac-mapping-test-suite.cc b/src/test/ns3wifi/wifi-ac-mapping-test-suite.cc index 7a717e811..f07feefff 100644 --- a/src/test/ns3wifi/wifi-ac-mapping-test-suite.cc +++ b/src/test/ns3wifi/wifi-ac-mapping-test-suite.cc @@ -335,10 +335,10 @@ class WifiAcMappingTestSuite : public TestSuite WifiAcMappingTestSuite::WifiAcMappingTestSuite() : TestSuite("wifi-ac-mapping", SYSTEM) { - AddTestCase(new WifiAcMappingTest(0xb8, 2), TestCase::QUICK); // EF in AC_VI - AddTestCase(new WifiAcMappingTest(0x28, 1), TestCase::QUICK); // AF11 in AC_BK - AddTestCase(new WifiAcMappingTest(0x70, 0), TestCase::QUICK); // AF32 in AC_BE - AddTestCase(new WifiAcMappingTest(0xc0, 3), TestCase::QUICK); // CS7 in AC_VO + AddTestCase(new WifiAcMappingTest(0xb8, 2), TestCase::Duration::QUICK); // EF in AC_VI + AddTestCase(new WifiAcMappingTest(0x28, 1), TestCase::Duration::QUICK); // AF11 in AC_BK + AddTestCase(new WifiAcMappingTest(0x70, 0), TestCase::Duration::QUICK); // AF32 in AC_BE + AddTestCase(new WifiAcMappingTest(0xc0, 3), TestCase::Duration::QUICK); // CS7 in AC_VO } static WifiAcMappingTestSuite wifiAcMappingTestSuite; diff --git a/src/test/ns3wifi/wifi-issue-211-test-suite.cc b/src/test/ns3wifi/wifi-issue-211-test-suite.cc index a6727efef..baa9f97e9 100644 --- a/src/test/ns3wifi/wifi-issue-211-test-suite.cc +++ b/src/test/ns3wifi/wifi-issue-211-test-suite.cc @@ -260,7 +260,7 @@ class Issue211TestSuite : public TestSuite Issue211TestSuite::Issue211TestSuite() : TestSuite("wifi-issue-211", UNIT) { - AddTestCase(new Issue211Test, TestCase::QUICK); + AddTestCase(new Issue211Test, TestCase::Duration::QUICK); } static Issue211TestSuite g_issue211TestSuite; ///< the test suite diff --git a/src/test/ns3wifi/wifi-msdu-aggregator-test-suite.cc b/src/test/ns3wifi/wifi-msdu-aggregator-test-suite.cc index 22725a180..03b4218df 100644 --- a/src/test/ns3wifi/wifi-msdu-aggregator-test-suite.cc +++ b/src/test/ns3wifi/wifi-msdu-aggregator-test-suite.cc @@ -220,7 +220,7 @@ class WifiMsduAggregatorTestSuite : public TestSuite WifiMsduAggregatorTestSuite::WifiMsduAggregatorTestSuite() : TestSuite("wifi-msdu-aggregator", SYSTEM) { - AddTestCase(new WifiMsduAggregatorThroughputTest, TestCase::QUICK); + AddTestCase(new WifiMsduAggregatorThroughputTest, TestCase::Duration::QUICK); } static WifiMsduAggregatorTestSuite wifiMsduAggregatorTestSuite; diff --git a/src/test/traced/traced-callback-typedef-test-suite.cc b/src/test/traced/traced-callback-typedef-test-suite.cc index 30b0d6b48..ba6fffc3b 100644 --- a/src/test/traced/traced-callback-typedef-test-suite.cc +++ b/src/test/traced/traced-callback-typedef-test-suite.cc @@ -539,7 +539,7 @@ class TracedCallbackTypedefTestSuite : public TestSuite TracedCallbackTypedefTestSuite::TracedCallbackTypedefTestSuite() : TestSuite("traced-callback-typedef", SYSTEM) { - AddTestCase(new TracedCallbackTypedefTestCase, TestCase::QUICK); + AddTestCase(new TracedCallbackTypedefTestCase, TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/test/traced/traced-value-callback-typedef-test-suite.cc b/src/test/traced/traced-value-callback-typedef-test-suite.cc index d0be8729c..317f364f0 100644 --- a/src/test/traced/traced-value-callback-typedef-test-suite.cc +++ b/src/test/traced/traced-value-callback-typedef-test-suite.cc @@ -261,7 +261,7 @@ class TracedValueCallbackTestSuite : public TestSuite TracedValueCallbackTestSuite::TracedValueCallbackTestSuite() : TestSuite("traced-value-callback", UNIT) { - AddTestCase(new TracedValueCallbackTestCase, TestCase::QUICK); + AddTestCase(new TracedValueCallbackTestCase, TestCase::Duration::QUICK); } /// Static variable for test initialization diff --git a/src/topology-read/test/rocketfuel-topology-reader-test-suite.cc b/src/topology-read/test/rocketfuel-topology-reader-test-suite.cc index bef919e80..8b5c9c7c3 100644 --- a/src/topology-read/test/rocketfuel-topology-reader-test-suite.cc +++ b/src/topology-read/test/rocketfuel-topology-reader-test-suite.cc @@ -147,8 +147,8 @@ class RocketfuelTopologyReaderTestSuite : public TestSuite RocketfuelTopologyReaderTestSuite::RocketfuelTopologyReaderTestSuite() : TestSuite("rocketfuel-topology-reader", UNIT) { - AddTestCase(new RocketfuelTopologyReaderWeightsTest(), TestCase::QUICK); - AddTestCase(new RocketfuelTopologyReaderMapsTest(), TestCase::QUICK); + AddTestCase(new RocketfuelTopologyReaderWeightsTest(), TestCase::Duration::QUICK); + AddTestCase(new RocketfuelTopologyReaderMapsTest(), TestCase::Duration::QUICK); } /** diff --git a/src/traffic-control/test/adaptive-red-queue-disc-test-suite.cc b/src/traffic-control/test/adaptive-red-queue-disc-test-suite.cc index 4a35c0367..a56b6489a 100644 --- a/src/traffic-control/test/adaptive-red-queue-disc-test-suite.cc +++ b/src/traffic-control/test/adaptive-red-queue-disc-test-suite.cc @@ -421,6 +421,6 @@ static class AredQueueDiscTestSuite : public TestSuite AredQueueDiscTestSuite() : TestSuite("adaptive-red-queue-disc", UNIT) { - AddTestCase(new AredQueueDiscTestCase(), TestCase::QUICK); + AddTestCase(new AredQueueDiscTestCase(), TestCase::Duration::QUICK); } } g_aredQueueDiscTestSuite; ///< the test suite diff --git a/src/traffic-control/test/cobalt-queue-disc-test-suite.cc b/src/traffic-control/test/cobalt-queue-disc-test-suite.cc index 51f9f80ea..16c831f74 100644 --- a/src/traffic-control/test/cobalt-queue-disc-test-suite.cc +++ b/src/traffic-control/test/cobalt-queue-disc-test-suite.cc @@ -1199,18 +1199,18 @@ static class CobaltQueueDiscTestSuite : public TestSuite : TestSuite("cobalt-queue-disc", UNIT) { // Test 1: simple enqueue/dequeue with no drops - AddTestCase(new CobaltQueueDiscBasicEnqueueDequeue(PACKETS), TestCase::QUICK); - AddTestCase(new CobaltQueueDiscBasicEnqueueDequeue(BYTES), TestCase::QUICK); + AddTestCase(new CobaltQueueDiscBasicEnqueueDequeue(PACKETS), TestCase::Duration::QUICK); + AddTestCase(new CobaltQueueDiscBasicEnqueueDequeue(BYTES), TestCase::Duration::QUICK); // Test 2: Drop test - AddTestCase(new CobaltQueueDiscDropTest(), TestCase::QUICK); + AddTestCase(new CobaltQueueDiscDropTest(), TestCase::Duration::QUICK); // Test 3: Mark test - AddTestCase(new CobaltQueueDiscMarkTest(PACKETS), TestCase::QUICK); - AddTestCase(new CobaltQueueDiscMarkTest(BYTES), TestCase::QUICK); + AddTestCase(new CobaltQueueDiscMarkTest(PACKETS), TestCase::Duration::QUICK); + AddTestCase(new CobaltQueueDiscMarkTest(BYTES), TestCase::Duration::QUICK); // Test 4: CE threshold marking test - AddTestCase(new CobaltQueueDiscCeThresholdTest(PACKETS), TestCase::QUICK); - AddTestCase(new CobaltQueueDiscCeThresholdTest(BYTES), TestCase::QUICK); + AddTestCase(new CobaltQueueDiscCeThresholdTest(PACKETS), TestCase::Duration::QUICK); + AddTestCase(new CobaltQueueDiscCeThresholdTest(BYTES), TestCase::Duration::QUICK); // Test 4: Blue enhancement test - AddTestCase(new CobaltQueueDiscEnhancedBlueTest(PACKETS), TestCase::QUICK); - AddTestCase(new CobaltQueueDiscEnhancedBlueTest(BYTES), TestCase::QUICK); + AddTestCase(new CobaltQueueDiscEnhancedBlueTest(PACKETS), TestCase::Duration::QUICK); + AddTestCase(new CobaltQueueDiscEnhancedBlueTest(BYTES), TestCase::Duration::QUICK); } } g_cobaltQueueTestSuite; ///< the test suite diff --git a/src/traffic-control/test/codel-queue-disc-test-suite.cc b/src/traffic-control/test/codel-queue-disc-test-suite.cc index ac20d3741..0a839d899 100644 --- a/src/traffic-control/test/codel-queue-disc-test-suite.cc +++ b/src/traffic-control/test/codel-queue-disc-test-suite.cc @@ -1332,20 +1332,24 @@ static class CoDelQueueDiscTestSuite : public TestSuite : TestSuite("codel-queue-disc", UNIT) { // Test 1: simple enqueue/dequeue with no drops - AddTestCase(new CoDelQueueDiscBasicEnqueueDequeue(QueueSizeUnit::PACKETS), TestCase::QUICK); - AddTestCase(new CoDelQueueDiscBasicEnqueueDequeue(QueueSizeUnit::BYTES), TestCase::QUICK); + AddTestCase(new CoDelQueueDiscBasicEnqueueDequeue(QueueSizeUnit::PACKETS), + TestCase::Duration::QUICK); + AddTestCase(new CoDelQueueDiscBasicEnqueueDequeue(QueueSizeUnit::BYTES), + TestCase::Duration::QUICK); // Test 2: enqueue with drops due to queue overflow - AddTestCase(new CoDelQueueDiscBasicOverflow(QueueSizeUnit::PACKETS), TestCase::QUICK); - AddTestCase(new CoDelQueueDiscBasicOverflow(QueueSizeUnit::BYTES), TestCase::QUICK); + AddTestCase(new CoDelQueueDiscBasicOverflow(QueueSizeUnit::PACKETS), + TestCase::Duration::QUICK); + AddTestCase(new CoDelQueueDiscBasicOverflow(QueueSizeUnit::BYTES), + TestCase::Duration::QUICK); // Test 3: test NewtonStep() against explicit port of Linux implementation - AddTestCase(new CoDelQueueDiscNewtonStepTest(), TestCase::QUICK); + AddTestCase(new CoDelQueueDiscNewtonStepTest(), TestCase::Duration::QUICK); // Test 4: test ControlLaw() against explicit port of Linux implementation - AddTestCase(new CoDelQueueDiscControlLawTest(), TestCase::QUICK); + AddTestCase(new CoDelQueueDiscControlLawTest(), TestCase::Duration::QUICK); // Test 5: enqueue/dequeue with drops according to CoDel algorithm - AddTestCase(new CoDelQueueDiscBasicDrop(QueueSizeUnit::PACKETS), TestCase::QUICK); - AddTestCase(new CoDelQueueDiscBasicDrop(QueueSizeUnit::BYTES), TestCase::QUICK); + AddTestCase(new CoDelQueueDiscBasicDrop(QueueSizeUnit::PACKETS), TestCase::Duration::QUICK); + AddTestCase(new CoDelQueueDiscBasicDrop(QueueSizeUnit::BYTES), TestCase::Duration::QUICK); // Test 6: enqueue/dequeue with marks according to CoDel algorithm - AddTestCase(new CoDelQueueDiscBasicMark(QueueSizeUnit::PACKETS), TestCase::QUICK); - AddTestCase(new CoDelQueueDiscBasicMark(QueueSizeUnit::BYTES), TestCase::QUICK); + AddTestCase(new CoDelQueueDiscBasicMark(QueueSizeUnit::PACKETS), TestCase::Duration::QUICK); + AddTestCase(new CoDelQueueDiscBasicMark(QueueSizeUnit::BYTES), TestCase::Duration::QUICK); } } g_coDelQueueTestSuite; ///< the test suite diff --git a/src/traffic-control/test/fifo-queue-disc-test-suite.cc b/src/traffic-control/test/fifo-queue-disc-test-suite.cc index 9e3fe3aa3..8306ef042 100644 --- a/src/traffic-control/test/fifo-queue-disc-test-suite.cc +++ b/src/traffic-control/test/fifo-queue-disc-test-suite.cc @@ -276,6 +276,6 @@ static class FifoQueueDiscTestSuite : public TestSuite FifoQueueDiscTestSuite() : TestSuite("fifo-queue-disc", UNIT) { - AddTestCase(new FifoQueueDiscTestCase(), TestCase::QUICK); + AddTestCase(new FifoQueueDiscTestCase(), TestCase::Duration::QUICK); } } g_fifoQueueTestSuite; ///< the test suite diff --git a/src/traffic-control/test/pie-queue-disc-test-suite.cc b/src/traffic-control/test/pie-queue-disc-test-suite.cc index d664d7400..c14096488 100644 --- a/src/traffic-control/test/pie-queue-disc-test-suite.cc +++ b/src/traffic-control/test/pie-queue-disc-test-suite.cc @@ -852,6 +852,6 @@ static class PieQueueDiscTestSuite : public TestSuite PieQueueDiscTestSuite() : TestSuite("pie-queue-disc", UNIT) { - AddTestCase(new PieQueueDiscTestCase(), TestCase::QUICK); + AddTestCase(new PieQueueDiscTestCase(), TestCase::Duration::QUICK); } } g_pieQueueTestSuite; ///< the test suite diff --git a/src/traffic-control/test/prio-queue-disc-test-suite.cc b/src/traffic-control/test/prio-queue-disc-test-suite.cc index 7d87f6681..227891cfe 100644 --- a/src/traffic-control/test/prio-queue-disc-test-suite.cc +++ b/src/traffic-control/test/prio-queue-disc-test-suite.cc @@ -324,6 +324,6 @@ static class PrioQueueDiscTestSuite : public TestSuite PrioQueueDiscTestSuite() : TestSuite("prio-queue-disc", UNIT) { - AddTestCase(new PrioQueueDiscTestCase(), TestCase::QUICK); + AddTestCase(new PrioQueueDiscTestCase(), TestCase::Duration::QUICK); } } g_prioQueueTestSuite; ///< the test suite diff --git a/src/traffic-control/test/queue-disc-traces-test-suite.cc b/src/traffic-control/test/queue-disc-traces-test-suite.cc index 02ba2703f..f37fbaf49 100644 --- a/src/traffic-control/test/queue-disc-traces-test-suite.cc +++ b/src/traffic-control/test/queue-disc-traces-test-suite.cc @@ -594,6 +594,6 @@ static class QueueDiscTracesTestSuite : public TestSuite QueueDiscTracesTestSuite() : TestSuite("queue-disc-traces", UNIT) { - AddTestCase(new QueueDiscTracesTestCase(), TestCase::QUICK); + AddTestCase(new QueueDiscTracesTestCase(), TestCase::Duration::QUICK); } } g_queueDiscTracesTestSuite; ///< the test suite diff --git a/src/traffic-control/test/red-queue-disc-test-suite.cc b/src/traffic-control/test/red-queue-disc-test-suite.cc index e0e28d197..3f9a5c351 100644 --- a/src/traffic-control/test/red-queue-disc-test-suite.cc +++ b/src/traffic-control/test/red-queue-disc-test-suite.cc @@ -624,6 +624,6 @@ static class RedQueueDiscTestSuite : public TestSuite RedQueueDiscTestSuite() : TestSuite("red-queue-disc", UNIT) { - AddTestCase(new RedQueueDiscTestCase(), TestCase::QUICK); + AddTestCase(new RedQueueDiscTestCase(), TestCase::Duration::QUICK); } } g_redQueueTestSuite; ///< the test suite diff --git a/src/traffic-control/test/tbf-queue-disc-test-suite.cc b/src/traffic-control/test/tbf-queue-disc-test-suite.cc index 85e981eb7..141bfdd48 100644 --- a/src/traffic-control/test/tbf-queue-disc-test-suite.cc +++ b/src/traffic-control/test/tbf-queue-disc-test-suite.cc @@ -548,6 +548,6 @@ static class TbfQueueDiscTestSuite : public TestSuite TbfQueueDiscTestSuite() : TestSuite("tbf-queue-disc", UNIT) { - AddTestCase(new TbfQueueDiscTestCase(), TestCase::QUICK); + AddTestCase(new TbfQueueDiscTestCase(), TestCase::Duration::QUICK); } } g_tbfQueueTestSuite; ///< the test suite diff --git a/src/traffic-control/test/tc-flow-control-test-suite.cc b/src/traffic-control/test/tc-flow-control-test-suite.cc index f9f9923a0..17c678866 100644 --- a/src/traffic-control/test/tc-flow-control-test-suite.cc +++ b/src/traffic-control/test/tc-flow-control-test-suite.cc @@ -503,18 +503,28 @@ static class TcFlowControlTestSuite : public TestSuite TcFlowControlTestSuite() : TestSuite("tc-flow-control", UNIT) { - AddTestCase(new TcFlowControlTestCase(QueueSizeUnit::PACKETS, 1, 10), TestCase::QUICK); - AddTestCase(new TcFlowControlTestCase(QueueSizeUnit::PACKETS, 5, 10), TestCase::QUICK); - AddTestCase(new TcFlowControlTestCase(QueueSizeUnit::PACKETS, 9, 10), TestCase::QUICK); - AddTestCase(new TcFlowControlTestCase(QueueSizeUnit::PACKETS, 10, 10), TestCase::QUICK); - AddTestCase(new TcFlowControlTestCase(QueueSizeUnit::PACKETS, 11, 10), TestCase::QUICK); - AddTestCase(new TcFlowControlTestCase(QueueSizeUnit::PACKETS, 15, 10), TestCase::QUICK); - AddTestCase(new TcFlowControlTestCase(QueueSizeUnit::PACKETS, 1, 1), TestCase::QUICK); - AddTestCase(new TcFlowControlTestCase(QueueSizeUnit::PACKETS, 2, 1), TestCase::QUICK); - AddTestCase(new TcFlowControlTestCase(QueueSizeUnit::PACKETS, 5, 1), TestCase::QUICK); + AddTestCase(new TcFlowControlTestCase(QueueSizeUnit::PACKETS, 1, 10), + TestCase::Duration::QUICK); + AddTestCase(new TcFlowControlTestCase(QueueSizeUnit::PACKETS, 5, 10), + TestCase::Duration::QUICK); + AddTestCase(new TcFlowControlTestCase(QueueSizeUnit::PACKETS, 9, 10), + TestCase::Duration::QUICK); + AddTestCase(new TcFlowControlTestCase(QueueSizeUnit::PACKETS, 10, 10), + TestCase::Duration::QUICK); + AddTestCase(new TcFlowControlTestCase(QueueSizeUnit::PACKETS, 11, 10), + TestCase::Duration::QUICK); + AddTestCase(new TcFlowControlTestCase(QueueSizeUnit::PACKETS, 15, 10), + TestCase::Duration::QUICK); + AddTestCase(new TcFlowControlTestCase(QueueSizeUnit::PACKETS, 1, 1), + TestCase::Duration::QUICK); + AddTestCase(new TcFlowControlTestCase(QueueSizeUnit::PACKETS, 2, 1), + TestCase::Duration::QUICK); + AddTestCase(new TcFlowControlTestCase(QueueSizeUnit::PACKETS, 5, 1), + TestCase::Duration::QUICK); // TODO: Right now, this test only works for 5000B and 10 packets (it's hard coded). Should // also be made parametric. - AddTestCase(new TcFlowControlTestCase(QueueSizeUnit::BYTES, 5000, 10), TestCase::QUICK); + AddTestCase(new TcFlowControlTestCase(QueueSizeUnit::BYTES, 5000, 10), + TestCase::Duration::QUICK); } } g_tcFlowControlTestSuite; ///< the test suite diff --git a/src/uan/test/uan-energy-model-test.cc b/src/uan/test/uan-energy-model-test.cc index 66f5e40a4..dcd63fc6c 100644 --- a/src/uan/test/uan-energy-model-test.cc +++ b/src/uan/test/uan-energy-model-test.cc @@ -336,8 +336,8 @@ class UanEnergyModelTestSuite : public TestSuite UanEnergyModelTestSuite::UanEnergyModelTestSuite() : TestSuite("uan-energy-model", UNIT) { - AddTestCase(new AcousticModemEnergyTestCase, TestCase::QUICK); - AddTestCase(new AcousticModemEnergyDepletionTestCase, TestCase::QUICK); + AddTestCase(new AcousticModemEnergyTestCase, TestCase::Duration::QUICK); + AddTestCase(new AcousticModemEnergyDepletionTestCase, TestCase::Duration::QUICK); } // create an instance of the test suite diff --git a/src/uan/test/uan-test.cc b/src/uan/test/uan-test.cc index 19064adde..5650eb407 100644 --- a/src/uan/test/uan-test.cc +++ b/src/uan/test/uan-test.cc @@ -325,7 +325,7 @@ class UanTestSuite : public TestSuite UanTestSuite::UanTestSuite() : TestSuite("devices-uan", UNIT) { - AddTestCase(new UanTest, TestCase::QUICK); + AddTestCase(new UanTest, TestCase::Duration::QUICK); } static UanTestSuite g_uanTestSuite; ///< the test suite diff --git a/src/wifi/test/block-ack-test-suite.cc b/src/wifi/test/block-ack-test-suite.cc index e4bca2fa2..18511877e 100644 --- a/src/wifi/test/block-ack-test-suite.cc +++ b/src/wifi/test/block-ack-test-suite.cc @@ -2020,15 +2020,15 @@ class BlockAckTestSuite : public TestSuite BlockAckTestSuite::BlockAckTestSuite() : TestSuite("wifi-block-ack", UNIT) { - AddTestCase(new PacketBufferingCaseA, TestCase::QUICK); - AddTestCase(new PacketBufferingCaseB, TestCase::QUICK); - AddTestCase(new OriginatorBlockAckWindowTest, TestCase::QUICK); - AddTestCase(new CtrlBAckResponseHeaderTest, TestCase::QUICK); - AddTestCase(new BlockAckRecipientBufferTest(0), TestCase::QUICK); - AddTestCase(new BlockAckRecipientBufferTest(4090), TestCase::QUICK); - AddTestCase(new MultiStaCtrlBAckResponseHeaderTest, TestCase::QUICK); - AddTestCase(new BlockAckAggregationDisabledTest(false), TestCase::QUICK); - AddTestCase(new BlockAckAggregationDisabledTest(true), TestCase::QUICK); + AddTestCase(new PacketBufferingCaseA, TestCase::Duration::QUICK); + AddTestCase(new PacketBufferingCaseB, TestCase::Duration::QUICK); + AddTestCase(new OriginatorBlockAckWindowTest, TestCase::Duration::QUICK); + AddTestCase(new CtrlBAckResponseHeaderTest, TestCase::Duration::QUICK); + AddTestCase(new BlockAckRecipientBufferTest(0), TestCase::Duration::QUICK); + AddTestCase(new BlockAckRecipientBufferTest(4090), TestCase::Duration::QUICK); + AddTestCase(new MultiStaCtrlBAckResponseHeaderTest, TestCase::Duration::QUICK); + AddTestCase(new BlockAckAggregationDisabledTest(false), TestCase::Duration::QUICK); + AddTestCase(new BlockAckAggregationDisabledTest(true), TestCase::Duration::QUICK); } static BlockAckTestSuite g_blockAckTestSuite; ///< the test suite diff --git a/src/wifi/test/channel-access-manager-test.cc b/src/wifi/test/channel-access-manager-test.cc index d12c25394..8f886e96f 100644 --- a/src/wifi/test/channel-access-manager-test.cc +++ b/src/wifi/test/channel-access-manager-test.cc @@ -1540,7 +1540,7 @@ class TxopTestSuite : public TestSuite TxopTestSuite::TxopTestSuite() : TestSuite("wifi-devices-dcf", UNIT) { - AddTestCase(new ChannelAccessManagerTest, TestCase::QUICK); + AddTestCase(new ChannelAccessManagerTest, TestCase::Duration::QUICK); } static TxopTestSuite g_dcfTestSuite; @@ -1560,7 +1560,7 @@ class QosTxopTestSuite : public TestSuite QosTxopTestSuite::QosTxopTestSuite() : TestSuite("wifi-devices-edca", UNIT) { - AddTestCase(new ChannelAccessManagerTest, TestCase::QUICK); + AddTestCase(new ChannelAccessManagerTest, TestCase::Duration::QUICK); } static QosTxopTestSuite g_edcaTestSuite; @@ -1580,7 +1580,7 @@ class ChannelAccessManagerTestSuite : public TestSuite ChannelAccessManagerTestSuite::ChannelAccessManagerTestSuite() : TestSuite("wifi-channel-access-manager", UNIT) { - AddTestCase(new LargestIdlePrimaryChannelTest, TestCase::QUICK); + AddTestCase(new LargestIdlePrimaryChannelTest, TestCase::Duration::QUICK); } static ChannelAccessManagerTestSuite g_camTestSuite; diff --git a/src/wifi/test/inter-bss-test-suite.cc b/src/wifi/test/inter-bss-test-suite.cc index 3dcc538ea..e406bcf52 100644 --- a/src/wifi/test/inter-bss-test-suite.cc +++ b/src/wifi/test/inter-bss-test-suite.cc @@ -999,8 +999,10 @@ class InterBssTestSuite : public TestSuite InterBssTestSuite::InterBssTestSuite() : TestSuite("wifi-inter-bss", UNIT) { - AddTestCase(new TestInterBssConstantObssPdAlgo(WIFI_STANDARD_80211ax), TestCase::QUICK); - AddTestCase(new TestInterBssConstantObssPdAlgo(WIFI_STANDARD_80211be), TestCase::QUICK); + AddTestCase(new TestInterBssConstantObssPdAlgo(WIFI_STANDARD_80211ax), + TestCase::Duration::QUICK); + AddTestCase(new TestInterBssConstantObssPdAlgo(WIFI_STANDARD_80211be), + TestCase::Duration::QUICK); } // Do not forget to allocate an instance of this TestSuite diff --git a/src/wifi/test/power-rate-adaptation-test.cc b/src/wifi/test/power-rate-adaptation-test.cc index 60d384670..f60932557 100644 --- a/src/wifi/test/power-rate-adaptation-test.cc +++ b/src/wifi/test/power-rate-adaptation-test.cc @@ -1170,7 +1170,7 @@ class PowerRateAdaptationTestSuite : public TestSuite PowerRateAdaptationTestSuite::PowerRateAdaptationTestSuite() : TestSuite("wifi-power-rate-adaptation", UNIT) { - AddTestCase(new PowerRateAdaptationTest, TestCase::QUICK); + AddTestCase(new PowerRateAdaptationTest, TestCase::Duration::QUICK); } static PowerRateAdaptationTestSuite g_powerRateAdaptationTestSuite; ///< the test suite diff --git a/src/wifi/test/spectrum-wifi-phy-test.cc b/src/wifi/test/spectrum-wifi-phy-test.cc index 0a7a4d9d4..9c9bd8cc8 100644 --- a/src/wifi/test/spectrum-wifi-phy-test.cc +++ b/src/wifi/test/spectrum-wifi-phy-test.cc @@ -1604,12 +1604,12 @@ class SpectrumWifiPhyTestSuite : public TestSuite SpectrumWifiPhyTestSuite::SpectrumWifiPhyTestSuite() : TestSuite("wifi-spectrum-wifi-phy", UNIT) { - AddTestCase(new SpectrumWifiPhyBasicTest, TestCase::QUICK); - AddTestCase(new SpectrumWifiPhyListenerTest, TestCase::QUICK); - AddTestCase(new SpectrumWifiPhyFilterTest, TestCase::QUICK); - AddTestCase(new SpectrumWifiPhyMultipleInterfacesTest(false), TestCase::QUICK); - AddTestCase(new SpectrumWifiPhyMultipleInterfacesTest(true), TestCase::QUICK); - AddTestCase(new SpectrumWifiPhyInterfacesHelperTest, TestCase::QUICK); + AddTestCase(new SpectrumWifiPhyBasicTest, TestCase::Duration::QUICK); + AddTestCase(new SpectrumWifiPhyListenerTest, TestCase::Duration::QUICK); + AddTestCase(new SpectrumWifiPhyFilterTest, TestCase::Duration::QUICK); + AddTestCase(new SpectrumWifiPhyMultipleInterfacesTest(false), TestCase::Duration::QUICK); + AddTestCase(new SpectrumWifiPhyMultipleInterfacesTest(true), TestCase::Duration::QUICK); + AddTestCase(new SpectrumWifiPhyInterfacesHelperTest, TestCase::Duration::QUICK); } static SpectrumWifiPhyTestSuite spectrumWifiPhyTestSuite; ///< the test suite diff --git a/src/wifi/test/tx-duration-test.cc b/src/wifi/test/tx-duration-test.cc index addfe7409..a75f2b724 100644 --- a/src/wifi/test/tx-duration-test.cc +++ b/src/wifi/test/tx-duration-test.cc @@ -1803,9 +1803,9 @@ class TxDurationTestSuite : public TestSuite TxDurationTestSuite::TxDurationTestSuite() : TestSuite("wifi-devices-tx-duration", UNIT) { - AddTestCase(new TxDurationTest, TestCase::QUICK); + AddTestCase(new TxDurationTest, TestCase::Duration::QUICK); - AddTestCase(new PhyHeaderSectionsTest, TestCase::QUICK); + AddTestCase(new PhyHeaderSectionsTest, TestCase::Duration::QUICK); // 20 MHz band, HeSigBDurationTest::OFDMA, even number of users per HE-SIG-B content channel AddTestCase(new HeSigBDurationTest( @@ -1816,7 +1816,7 @@ TxDurationTestSuite::TxDurationTestSuite() {96}, std::make_pair(2, 0), // both users in HE-SIG-B content channel 1 MicroSeconds(4)), // one OFDM symbol; - TestCase::QUICK); + TestCase::Duration::QUICK); // 40 MHz band, HeSigBDurationTest::OFDMA, even number of users per HE-SIG-B content channel AddTestCase( @@ -1833,7 +1833,7 @@ TxDurationTestSuite::TxDurationTestSuite() std::make_pair(2, 4), // two users in HE-SIG-B content channel 1 and // four users in HE-SIG-B content channel 2 MicroSeconds(4)), // one OFDM symbol; - TestCase::QUICK); + TestCase::Duration::QUICK); // 40 MHz band, HeSigBDurationTest::OFDMA, odd number of users per HE-SIG-B content channel AddTestCase( @@ -1851,7 +1851,7 @@ TxDurationTestSuite::TxDurationTestSuite() std::make_pair(2, 5), // two users in HE-SIG-B content channel 1 and // five users in HE-SIG-B content channel 2 MicroSeconds(8)), // two OFDM symbols - TestCase::QUICK); + TestCase::Duration::QUICK); // 80 MHz band, OFDMA AddTestCase( @@ -1871,7 +1871,7 @@ TxDurationTestSuite::TxDurationTestSuite() std::make_pair(3, 6), // three users in HE-SIG-B content channel 1 // and six users in HE-SIG-B content channel 2 MicroSeconds(16)), // four OFDM symbols - TestCase::QUICK); + TestCase::Duration::QUICK); // 160 MHz band, OFDMA AddTestCase( @@ -1892,7 +1892,7 @@ TxDurationTestSuite::TxDurationTestSuite() std::make_pair(4, 7), // four users in HE-SIG-B content channel 1 and // seven users in HE-SIG-B content channel 2 MicroSeconds(20)), // five OFDM symbols - TestCase::QUICK); + TestCase::Duration::QUICK); // 20 MHz band, HeSigBDurationTest::OFDMA, one unallocated RU at the middle AddTestCase( @@ -1910,7 +1910,7 @@ TxDurationTestSuite::TxDurationTestSuite() {0}, std::make_pair(9, 0), // 9 users in HE-SIG-B content channel 1 MicroSeconds(8)), // two OFDM symbols - TestCase::QUICK); + TestCase::Duration::QUICK); // 40 MHz band, HeSigBDurationTest::OFDMA, unallocated RUs at the begin and at the end of the // first 20 MHz subband and in the middle of the second 20 MHz subband @@ -1925,7 +1925,7 @@ TxDurationTestSuite::TxDurationTestSuite() {112, 112}, std::make_pair(4, 4), // 4 users in both HE-SIG-B content channels MicroSeconds(4)), // two OFDM symbols - TestCase::QUICK); + TestCase::Duration::QUICK); // 40 MHz band, HeSigBDurationTest::OFDMA, one unallocated RUs in the first 20 MHz subband and // two unallocated RUs in second 20 MHz subband @@ -1941,7 +1941,7 @@ TxDurationTestSuite::TxDurationTestSuite() {112, 112}, std::make_pair(4, 4), // 4 users in both HE-SIG-B content channels MicroSeconds(4)), // two OFDM symbols - TestCase::QUICK); + TestCase::Duration::QUICK); // 20 MHz band, MU-MIMO, 2 users AddTestCase(new HeSigBDurationTest( @@ -1952,7 +1952,7 @@ TxDurationTestSuite::TxDurationTestSuite() {192}, std::make_pair(2, 0), // both users in HE-SIG-B content channel 1 MicroSeconds(4)), // one OFDM symbol - TestCase::QUICK); + TestCase::Duration::QUICK); // 20 MHz band, MU-MIMO, 3 users AddTestCase( @@ -1965,7 +1965,7 @@ TxDurationTestSuite::TxDurationTestSuite() {192}, std::make_pair(3, 0), // all users in HE-SIG-B content channel 1 MicroSeconds(4)), // one OFDM symbol - TestCase::QUICK); + TestCase::Duration::QUICK); // 20 MHz band, MU-MIMO, 4 users AddTestCase( @@ -1979,7 +1979,7 @@ TxDurationTestSuite::TxDurationTestSuite() {192}, std::make_pair(4, 0), // all users in HE-SIG-B content channel 1 MicroSeconds(4)), // one OFDM symbol - TestCase::QUICK); + TestCase::Duration::QUICK); // 20 MHz band, MU-MIMO, 6 users AddTestCase( @@ -1995,7 +1995,7 @@ TxDurationTestSuite::TxDurationTestSuite() {192}, std::make_pair(6, 0), // all users in HE-SIG-B content channel 1 MicroSeconds(4)), // one OFDM symbol - TestCase::QUICK); + TestCase::Duration::QUICK); // 20 MHz band, MU-MIMO, 8 users AddTestCase( @@ -2013,7 +2013,7 @@ TxDurationTestSuite::TxDurationTestSuite() {192}, std::make_pair(8, 0), // all users in HE-SIG-B content channel 1 MicroSeconds(8)), // two OFDM symbols - TestCase::QUICK); + TestCase::Duration::QUICK); // 40 MHz band, MU-MIMO, 2 users AddTestCase(new HeSigBDurationTest( @@ -2024,7 +2024,7 @@ TxDurationTestSuite::TxDurationTestSuite() {200, 200}, std::make_pair(1, 1), // users equally split between the two content channels MicroSeconds(4)), // one OFDM symbol - TestCase::QUICK); + TestCase::Duration::QUICK); // 40 MHz band, MU-MIMO, 3 users AddTestCase( @@ -2038,7 +2038,7 @@ TxDurationTestSuite::TxDurationTestSuite() {200, 200}, std::make_pair(2, 1), // 2 users in content channel 1 and 1 user in content channel 2 MicroSeconds(4)), // one OFDM symbol - TestCase::QUICK); + TestCase::Duration::QUICK); // 40 MHz band, MU-MIMO, 4 users AddTestCase(new HeSigBDurationTest( @@ -2052,7 +2052,7 @@ TxDurationTestSuite::TxDurationTestSuite() {200, 200}, std::make_pair(2, 2), // users equally split between the two content channels MicroSeconds(4)), // one OFDM symbol - TestCase::QUICK); + TestCase::Duration::QUICK); // 40 MHz band, MU-MIMO, 6 users AddTestCase(new HeSigBDurationTest( @@ -2068,7 +2068,7 @@ TxDurationTestSuite::TxDurationTestSuite() {200, 200}, std::make_pair(3, 3), // users equally split between the two content channels MicroSeconds(4)), // one OFDM symbol - TestCase::QUICK); + TestCase::Duration::QUICK); // 40 MHz band, MU-MIMO, 8 users AddTestCase(new HeSigBDurationTest( @@ -2086,7 +2086,7 @@ TxDurationTestSuite::TxDurationTestSuite() {200, 200}, std::make_pair(4, 4), // users equally split between the two content channels MicroSeconds(4)), // one OFDM symbol - TestCase::QUICK); + TestCase::Duration::QUICK); // 80 MHz band, MU-MIMO, 2 users AddTestCase(new HeSigBDurationTest( @@ -2097,7 +2097,7 @@ TxDurationTestSuite::TxDurationTestSuite() {208, 208, 208, 208}, std::make_pair(1, 1), // users equally split between the two content channels MicroSeconds(4)), // one OFDM symbol - TestCase::QUICK); + TestCase::Duration::QUICK); // 80 MHz band, MU-MIMO, 3 users AddTestCase( @@ -2111,7 +2111,7 @@ TxDurationTestSuite::TxDurationTestSuite() {208, 208, 208, 208}, std::make_pair(2, 1), // 2 users in content channel 1 and 1 user in content channel 2 MicroSeconds(4)), // one OFDM symbol - TestCase::QUICK); + TestCase::Duration::QUICK); // 80 MHz band, MU-MIMO, 4 users AddTestCase(new HeSigBDurationTest( @@ -2125,7 +2125,7 @@ TxDurationTestSuite::TxDurationTestSuite() {208, 208, 208, 208}, std::make_pair(2, 2), // users equally split between the two content channels MicroSeconds(4)), // one OFDM symbol - TestCase::QUICK); + TestCase::Duration::QUICK); // 80 MHz band, MU-MIMO, 6 users AddTestCase(new HeSigBDurationTest( @@ -2141,7 +2141,7 @@ TxDurationTestSuite::TxDurationTestSuite() {208, 208, 208, 208}, std::make_pair(3, 3), // users equally split between the two content channels MicroSeconds(4)), // one OFDM symbol - TestCase::QUICK); + TestCase::Duration::QUICK); // 80 MHz band, MU-MIMO, 8 users AddTestCase(new HeSigBDurationTest( @@ -2159,7 +2159,7 @@ TxDurationTestSuite::TxDurationTestSuite() {208, 208, 208, 208}, std::make_pair(4, 4), // users equally split between the two content channels MicroSeconds(4)), // one OFDM symbol - TestCase::QUICK); + TestCase::Duration::QUICK); // 160 MHz band, MU-MIMO, 2 users AddTestCase( @@ -2171,7 +2171,7 @@ TxDurationTestSuite::TxDurationTestSuite() {208, 208, 208, 208, 208, 208, 208, 208}, std::make_pair(1, 1), // users equally split between the two content channels MicroSeconds(4)), // one OFDM symbol - TestCase::QUICK); + TestCase::Duration::QUICK); // 160 MHz band, MU-MIMO, 3 users AddTestCase( @@ -2185,7 +2185,7 @@ TxDurationTestSuite::TxDurationTestSuite() {208, 208, 208, 208, 208, 208, 208, 208}, std::make_pair(2, 1), // 2 users in content channel 1 and 1 user in content channel 2 MicroSeconds(4)), // one OFDM symbol - TestCase::QUICK); + TestCase::Duration::QUICK); // 160 MHz band, MU-MIMO, 4 users AddTestCase(new HeSigBDurationTest( @@ -2199,7 +2199,7 @@ TxDurationTestSuite::TxDurationTestSuite() {208, 208, 208, 208, 208, 208, 208, 208}, std::make_pair(2, 2), // users equally split between the two content channels MicroSeconds(4)), // one OFDM symbol - TestCase::QUICK); + TestCase::Duration::QUICK); // 160 MHz band, MU-MIMO, 6 users AddTestCase(new HeSigBDurationTest( @@ -2215,7 +2215,7 @@ TxDurationTestSuite::TxDurationTestSuite() {208, 208, 208, 208, 208, 208, 208, 208}, std::make_pair(3, 3), // users equally split between the two content channels MicroSeconds(4)), // one OFDM symbol - TestCase::QUICK); + TestCase::Duration::QUICK); // 160 MHz band, MU-MIMO, 8 users AddTestCase(new HeSigBDurationTest( @@ -2233,7 +2233,7 @@ TxDurationTestSuite::TxDurationTestSuite() {208, 208, 208, 208, 208, 208, 208, 208}, std::make_pair(4, 4), // users equally split between the two content channels MicroSeconds(4)), // one OFDM symbol - TestCase::QUICK); + TestCase::Duration::QUICK); } static TxDurationTestSuite g_txDurationTestSuite; ///< the test suite diff --git a/src/wifi/test/wifi-aggregation-test.cc b/src/wifi/test/wifi-aggregation-test.cc index b37d19e62..db05c98fb 100644 --- a/src/wifi/test/wifi-aggregation-test.cc +++ b/src/wifi/test/wifi-aggregation-test.cc @@ -1138,13 +1138,13 @@ class WifiAggregationTestSuite : public TestSuite WifiAggregationTestSuite::WifiAggregationTestSuite() : TestSuite("wifi-aggregation", UNIT) { - AddTestCase(new AmpduAggregationTest, TestCase::QUICK); - AddTestCase(new TwoLevelAggregationTest, TestCase::QUICK); - AddTestCase(new HeAggregationTest(64), TestCase::QUICK); - AddTestCase(new HeAggregationTest(256), TestCase::QUICK); - AddTestCase(new EhtAggregationTest(512), TestCase::QUICK); - AddTestCase(new EhtAggregationTest(1024), TestCase::QUICK); - AddTestCase(new PreservePacketsInAmpdus, TestCase::QUICK); + AddTestCase(new AmpduAggregationTest, TestCase::Duration::QUICK); + AddTestCase(new TwoLevelAggregationTest, TestCase::Duration::QUICK); + AddTestCase(new HeAggregationTest(64), TestCase::Duration::QUICK); + AddTestCase(new HeAggregationTest(256), TestCase::Duration::QUICK); + AddTestCase(new EhtAggregationTest(512), TestCase::Duration::QUICK); + AddTestCase(new EhtAggregationTest(1024), TestCase::Duration::QUICK); + AddTestCase(new PreservePacketsInAmpdus, TestCase::Duration::QUICK); } static WifiAggregationTestSuite g_wifiAggregationTestSuite; ///< the test suite diff --git a/src/wifi/test/wifi-channel-switching-test.cc b/src/wifi/test/wifi-channel-switching-test.cc index 7442983cc..18d8a54af 100644 --- a/src/wifi/test/wifi-channel-switching-test.cc +++ b/src/wifi/test/wifi-channel-switching-test.cc @@ -317,7 +317,7 @@ class WifiChannelSwitchingTestSuite : public TestSuite WifiChannelSwitchingTestSuite::WifiChannelSwitchingTestSuite() : TestSuite("wifi-channel-switching", UNIT) { - AddTestCase(new WifiChannelSwitchingTest, TestCase::QUICK); + AddTestCase(new WifiChannelSwitchingTest, TestCase::Duration::QUICK); } static WifiChannelSwitchingTestSuite g_issue211TestSuite; ///< the test suite diff --git a/src/wifi/test/wifi-dynamic-bw-op-test.cc b/src/wifi/test/wifi-dynamic-bw-op-test.cc index 47fd17fd4..6aed789da 100644 --- a/src/wifi/test/wifi-dynamic-bw-op-test.cc +++ b/src/wifi/test/wifi-dynamic-bw-op-test.cc @@ -443,7 +443,7 @@ WifiDynamicBwOpTestSuite::WifiDynamicBwOpTestSuite() * └────────┘ */ AddTestCase(new WifiUseAvailBwTest({"{54, 40, BAND_5GHZ, 1}", "{52, 20, BAND_5GHZ, 0}"}, 20), - TestCase::QUICK); + TestCase::Duration::QUICK); /** * ─── primary 40 ─── * primary20 @@ -457,7 +457,7 @@ WifiDynamicBwOpTestSuite::WifiDynamicBwOpTestSuite() * primary20 */ AddTestCase(new WifiUseAvailBwTest({"{58, 80, BAND_5GHZ, 0}", "{62, 40, BAND_5GHZ, 1}"}, 40), - TestCase::QUICK); + TestCase::Duration::QUICK); /** * ─────────── primary 80 ─────────── * primary20 @@ -471,7 +471,7 @@ WifiDynamicBwOpTestSuite::WifiDynamicBwOpTestSuite() * primary20 */ AddTestCase(new WifiUseAvailBwTest({"{50, 160, BAND_5GHZ, 5}", "{42, 80, BAND_5GHZ, 2}"}, 80), - TestCase::QUICK); + TestCase::Duration::QUICK); } static WifiDynamicBwOpTestSuite g_wifiDynamicBwOpTestSuite; ///< the test suite diff --git a/src/wifi/test/wifi-eht-info-elems-test.cc b/src/wifi/test/wifi-eht-info-elems-test.cc index ee19ddf63..df641c82c 100644 --- a/src/wifi/test/wifi-eht-info-elems-test.cc +++ b/src/wifi/test/wifi-eht-info-elems-test.cc @@ -1374,29 +1374,29 @@ class WifiEhtInfoElemsTestSuite : public TestSuite WifiEhtInfoElemsTestSuite::WifiEhtInfoElemsTestSuite() : TestSuite("wifi-eht-info-elems", UNIT) { - AddTestCase(new BasicMultiLinkElementTest(), TestCase::QUICK); - AddTestCase(new ReducedNeighborReportTest(), TestCase::QUICK); - AddTestCase(new WifiEhtCapabilitiesIeTest(false, 20), TestCase::QUICK); - AddTestCase(new WifiEhtCapabilitiesIeTest(true, 20), TestCase::QUICK); - AddTestCase(new WifiEhtCapabilitiesIeTest(false, 80), TestCase::QUICK); - AddTestCase(new WifiEhtCapabilitiesIeTest(true, 40), TestCase::QUICK); - AddTestCase(new WifiEhtCapabilitiesIeTest(true, 80), TestCase::QUICK); - AddTestCase(new WifiEhtCapabilitiesIeTest(false, 160), TestCase::QUICK); - AddTestCase(new WifiEhtCapabilitiesIeTest(false, 320), TestCase::QUICK); + AddTestCase(new BasicMultiLinkElementTest(), TestCase::Duration::QUICK); + AddTestCase(new ReducedNeighborReportTest(), TestCase::Duration::QUICK); + AddTestCase(new WifiEhtCapabilitiesIeTest(false, 20), TestCase::Duration::QUICK); + AddTestCase(new WifiEhtCapabilitiesIeTest(true, 20), TestCase::Duration::QUICK); + AddTestCase(new WifiEhtCapabilitiesIeTest(false, 80), TestCase::Duration::QUICK); + AddTestCase(new WifiEhtCapabilitiesIeTest(true, 40), TestCase::Duration::QUICK); + AddTestCase(new WifiEhtCapabilitiesIeTest(true, 80), TestCase::Duration::QUICK); + AddTestCase(new WifiEhtCapabilitiesIeTest(false, 160), TestCase::Duration::QUICK); + AddTestCase(new WifiEhtCapabilitiesIeTest(false, 320), TestCase::Duration::QUICK); AddTestCase( new TidToLinkMappingElementTest(WifiDirection::DOWNLINK, std::nullopt, std::nullopt, {}), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TidToLinkMappingElementTest(WifiDirection::UPLINK, MicroSeconds(500 * 1024), MicroSeconds(300 * 1024), {{3, std::set{0, 4, 6}}}), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TidToLinkMappingElementTest( WifiDirection::BOTH_DIRECTIONS, std::nullopt, MicroSeconds(100 * 1024), {{3, std::set{0, 4, 6}}, {6, std::set{3, 7, 11, 14}}}), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TidToLinkMappingElementTest(WifiDirection::DOWNLINK, MicroSeconds(100 * 1024), std::nullopt, @@ -1408,9 +1408,9 @@ WifiEhtInfoElemsTestSuite::WifiEhtInfoElemsTestSuite() {5, std::set{14}}, {6, std::set{1, 3, 6}}, {7, std::set{11, 14}}}), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EhtOperationElementTest({0, 0, 0, 0, 0}, 1, 2, 3, 4, 5, 6, 7, 8, std::nullopt), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EhtOperationElementTest({1, 0, 0, 1, 0}, 1, 2, @@ -1421,7 +1421,7 @@ WifiEhtInfoElemsTestSuite::WifiEhtInfoElemsTestSuite() 7, 8, EhtOperation::EhtOpInfo{{1}, 3, 5}), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EhtOperationElementTest({1, 1, 1, 1, 2}, 1, 2, @@ -1432,7 +1432,7 @@ WifiEhtInfoElemsTestSuite::WifiEhtInfoElemsTestSuite() 7, 8, EhtOperation::EhtOpInfo{{2}, 4, 6, 3000}), - TestCase::QUICK); + TestCase::Duration::QUICK); } static WifiEhtInfoElemsTestSuite g_wifiEhtInfoElemsTestSuite; ///< the test suite diff --git a/src/wifi/test/wifi-emlsr-test.cc b/src/wifi/test/wifi-emlsr-test.cc index c78ca9f13..b1465eb4f 100644 --- a/src/wifi/test/wifi-emlsr-test.cc +++ b/src/wifi/test/wifi-emlsr-test.cc @@ -3492,39 +3492,40 @@ EmlsrLinkSwitchTest::CheckResults() WifiEmlsrTestSuite::WifiEmlsrTestSuite() : TestSuite("wifi-emlsr", UNIT) { - AddTestCase(new EmlOperatingModeNotificationTest(), TestCase::QUICK); - AddTestCase(new EmlOmnExchangeTest({1, 2}, MicroSeconds(0)), TestCase::QUICK); - AddTestCase(new EmlOmnExchangeTest({1, 2}, MicroSeconds(2048)), TestCase::QUICK); - AddTestCase(new EmlOmnExchangeTest({0, 1, 2, 3}, MicroSeconds(0)), TestCase::QUICK); - AddTestCase(new EmlOmnExchangeTest({0, 1, 2, 3}, MicroSeconds(2048)), TestCase::QUICK); + AddTestCase(new EmlOperatingModeNotificationTest(), TestCase::Duration::QUICK); + AddTestCase(new EmlOmnExchangeTest({1, 2}, MicroSeconds(0)), TestCase::Duration::QUICK); + AddTestCase(new EmlOmnExchangeTest({1, 2}, MicroSeconds(2048)), TestCase::Duration::QUICK); + AddTestCase(new EmlOmnExchangeTest({0, 1, 2, 3}, MicroSeconds(0)), TestCase::Duration::QUICK); + AddTestCase(new EmlOmnExchangeTest({0, 1, 2, 3}, MicroSeconds(2048)), + TestCase::Duration::QUICK); for (const auto& emlsrLinks : {std::set{0, 1, 2}, std::set{1, 2}, std::set{0, 1}}) { AddTestCase( new EmlsrDlTxopTest( {1, 0, emlsrLinks, {MicroSeconds(32)}, {MicroSeconds(32)}, MicroSeconds(512)}), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new EmlsrDlTxopTest( {1, 1, emlsrLinks, {MicroSeconds(64)}, {MicroSeconds(64)}, MicroSeconds(512)}), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new EmlsrDlTxopTest({2, 2, emlsrLinks, {MicroSeconds(128), MicroSeconds(256)}, {MicroSeconds(128), MicroSeconds(256)}, MicroSeconds(512)}), - TestCase::QUICK); + TestCase::Duration::QUICK); } for (auto genBackoffIfTxopWithoutTx : {true, false}) { AddTestCase(new EmlsrUlTxopTest( {{0, 1, 2}, 40, 20, MicroSeconds(5504), 3, genBackoffIfTxopWithoutTx}), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new EmlsrUlTxopTest({{0, 1}, 40, 20, MicroSeconds(5504), 1, genBackoffIfTxopWithoutTx}), - TestCase::QUICK); + TestCase::Duration::QUICK); } for (bool switchAuxPhy : {true, false}) @@ -3535,7 +3536,7 @@ WifiEmlsrTestSuite::WifiEmlsrTestSuite() { AddTestCase( new EmlsrLinkSwitchTest({switchAuxPhy, resetCamState, auxPhyMaxChWidth}), - TestCase::QUICK); + TestCase::Duration::QUICK); } } } diff --git a/src/wifi/test/wifi-error-rate-models-test.cc b/src/wifi/test/wifi-error-rate-models-test.cc index 1ad6c81ea..7eb6ff24e 100644 --- a/src/wifi/test/wifi-error-rate-models-test.cc +++ b/src/wifi/test/wifi-error-rate-models-test.cc @@ -1053,58 +1053,58 @@ class WifiErrorRateModelsTestSuite : public TestSuite WifiErrorRateModelsTestSuite::WifiErrorRateModelsTestSuite() : TestSuite("wifi-error-rate-models", UNIT) { - AddTestCase(new WifiErrorRateModelsTestCaseDsss, TestCase::QUICK); - AddTestCase(new WifiErrorRateModelsTestCaseNist, TestCase::QUICK); - AddTestCase(new WifiErrorRateModelsTestCaseMimo, TestCase::QUICK); + AddTestCase(new WifiErrorRateModelsTestCaseDsss, TestCase::Duration::QUICK); + AddTestCase(new WifiErrorRateModelsTestCaseNist, TestCase::Duration::QUICK); + AddTestCase(new WifiErrorRateModelsTestCaseMimo, TestCase::Duration::QUICK); AddTestCase(new TableBasedErrorRateTestCase("DefaultTableBasedHtMcs0-1458bytes", HtPhy::GetHtMcs0(), 1458), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TableBasedErrorRateTestCase("DefaultTableBasedHtMcs0-32bytes", HtPhy::GetHtMcs0(), 32), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TableBasedErrorRateTestCase("DefaultTableBasedHtMcs0-1000bytes", HtPhy::GetHtMcs0(), 1000), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TableBasedErrorRateTestCase("DefaultTableBasedHtMcs0-1byte", HtPhy::GetHtMcs0(), 1), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TableBasedErrorRateTestCase("DefaultTableBasedHtMcs0-2000bytes", HtPhy::GetHtMcs0(), 2000), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TableBasedErrorRateTestCase("DefaultTableBasedHtMcs7-1500bytes", HtPhy::GetHtMcs7(), 1500), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TableBasedErrorRateTestCase("DefaultTableBasedVhtMcs0-1458bytes", VhtPhy::GetVhtMcs0(), 1458), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TableBasedErrorRateTestCase("DefaultTableBasedVhtMcs0-32bytes", VhtPhy::GetVhtMcs0(), 32), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TableBasedErrorRateTestCase("DefaultTableBasedVhtMcs0-1000bytes", VhtPhy::GetVhtMcs0(), 1000), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase( new TableBasedErrorRateTestCase("DefaultTableBasedVhtMcs0-1byte", VhtPhy::GetVhtMcs0(), 1), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TableBasedErrorRateTestCase("DefaultTableBasedVhtMcs0-2000bytes", VhtPhy::GetVhtMcs0(), 2000), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TableBasedErrorRateTestCase("DefaultTableBasedVhtMcs8-1500bytes", VhtPhy::GetVhtMcs8(), 1500), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new TableBasedErrorRateTestCase("FallbackTableBasedHeMcs11-1458bytes", HePhy::GetHeMcs11(), 1458), - TestCase::QUICK); + TestCase::Duration::QUICK); } static WifiErrorRateModelsTestSuite wifiErrorRateModelsTestSuite; ///< the test suite diff --git a/src/wifi/test/wifi-ie-fragment-test.cc b/src/wifi/test/wifi-ie-fragment-test.cc index 261187c5f..3310d0b88 100644 --- a/src/wifi/test/wifi-ie-fragment-test.cc +++ b/src/wifi/test/wifi-ie-fragment-test.cc @@ -602,8 +602,8 @@ class WifiIeFragmentationTestSuite : public TestSuite WifiIeFragmentationTestSuite::WifiIeFragmentationTestSuite() : TestSuite("wifi-ie-fragment", UNIT) { - AddTestCase(new WifiIeFragmentationTest(false), TestCase::QUICK); - AddTestCase(new WifiIeFragmentationTest(true), TestCase::QUICK); + AddTestCase(new WifiIeFragmentationTest(false), TestCase::Duration::QUICK); + AddTestCase(new WifiIeFragmentationTest(true), TestCase::Duration::QUICK); } static WifiIeFragmentationTestSuite g_wifiIeFragmentationTestSuite; ///< the test suite diff --git a/src/wifi/test/wifi-mac-ofdma-test.cc b/src/wifi/test/wifi-mac-ofdma-test.cc index 70e2db481..3f29cb020 100644 --- a/src/wifi/test/wifi-mac-ofdma-test.cc +++ b/src/wifi/test/wifi-mac-ofdma-test.cc @@ -2301,7 +2301,7 @@ WifiMacOfdmaTestSuite::WifiMacOfdmaTestSuite() 15, muEdcaParameterSet, scenario), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OfdmaAckSequenceTest(20, WifiAcknowledgment::DL_MU_AGGREGATE_TF, 10000, @@ -2309,7 +2309,7 @@ WifiMacOfdmaTestSuite::WifiMacOfdmaTestSuite() 15, muEdcaParameterSet, scenario), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OfdmaAckSequenceTest(20, WifiAcknowledgment::DL_MU_TF_MU_BAR, 10000, @@ -2317,7 +2317,7 @@ WifiMacOfdmaTestSuite::WifiMacOfdmaTestSuite() 15, muEdcaParameterSet, scenario), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OfdmaAckSequenceTest(40, WifiAcknowledgment::DL_MU_BAR_BA_SEQUENCE, 10000, @@ -2325,7 +2325,7 @@ WifiMacOfdmaTestSuite::WifiMacOfdmaTestSuite() 15, muEdcaParameterSet, scenario), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OfdmaAckSequenceTest(40, WifiAcknowledgment::DL_MU_AGGREGATE_TF, 10000, @@ -2333,7 +2333,7 @@ WifiMacOfdmaTestSuite::WifiMacOfdmaTestSuite() 15, muEdcaParameterSet, scenario), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new OfdmaAckSequenceTest(40, WifiAcknowledgment::DL_MU_TF_MU_BAR, 10000, @@ -2341,7 +2341,7 @@ WifiMacOfdmaTestSuite::WifiMacOfdmaTestSuite() 15, muEdcaParameterSet, scenario), - TestCase::QUICK); + TestCase::Duration::QUICK); } } } diff --git a/src/wifi/test/wifi-mac-queue-test.cc b/src/wifi/test/wifi-mac-queue-test.cc index c49767506..cd690c291 100644 --- a/src/wifi/test/wifi-mac-queue-test.cc +++ b/src/wifi/test/wifi-mac-queue-test.cc @@ -443,8 +443,8 @@ class WifiMacQueueTestSuite : public TestSuite WifiMacQueueTestSuite::WifiMacQueueTestSuite() : TestSuite("wifi-mac-queue", UNIT) { - AddTestCase(new WifiMacQueueDropOldestTest, TestCase::QUICK); - AddTestCase(new WifiExtractExpiredMpdusTest, TestCase::QUICK); + AddTestCase(new WifiMacQueueDropOldestTest, TestCase::Duration::QUICK); + AddTestCase(new WifiExtractExpiredMpdusTest, TestCase::Duration::QUICK); } static WifiMacQueueTestSuite g_wifiMacQueueTestSuite; ///< the test suite diff --git a/src/wifi/test/wifi-mlo-test.cc b/src/wifi/test/wifi-mlo-test.cc index 55c080499..78208aaa0 100644 --- a/src/wifi/test/wifi-mlo-test.cc +++ b/src/wifi/test/wifi-mlo-test.cc @@ -3123,8 +3123,8 @@ WifiMultiLinkOperationsTestSuite::WifiMultiLinkOperationsTestSuite() std::string, // DL TID-to-Link Mapping std::string>; // UL TID-to-Link Mapping - AddTestCase(new GetRnrLinkInfoTest(), TestCase::QUICK); - AddTestCase(new MldSwapLinksTest(), TestCase::QUICK); + AddTestCase(new GetRnrLinkInfoTest(), TestCase::Duration::QUICK); + AddTestCase(new MldSwapLinksTest(), TestCase::Duration::QUICK); for (const auto& [baseParams, setupLinks, @@ -3235,14 +3235,14 @@ WifiMultiLinkOperationsTestSuite::WifiMultiLinkOperationsTestSuite() apNegSupport, dlTidLinkMapping, ulTidLinkMapping), - TestCase::QUICK); + TestCase::Duration::QUICK); AddTestCase(new MultiLinkSetupTest(baseParams, WifiScanType::ACTIVE, setupLinks, apNegSupport, dlTidLinkMapping, ulTidLinkMapping), - TestCase::QUICK); + TestCase::Duration::QUICK); for (const auto& trafficPattern : {WifiTrafficPattern::STA_TO_STA, WifiTrafficPattern::STA_TO_AP, @@ -3256,7 +3256,7 @@ WifiMultiLinkOperationsTestSuite::WifiMultiLinkOperationsTestSuite() WifiBaEnabled::NO, WifiUseBarAfterMissedBa::NO, 1), - TestCase::QUICK); + TestCase::Duration::QUICK); for (const auto& useBarAfterMissedBa : {WifiUseBarAfterMissedBa::YES, WifiUseBarAfterMissedBa::NO}) { @@ -3266,14 +3266,14 @@ WifiMultiLinkOperationsTestSuite::WifiMultiLinkOperationsTestSuite() WifiBaEnabled::YES, useBarAfterMissedBa, 1), - TestCase::QUICK); + TestCase::Duration::QUICK); // Block Ack agreement with nMaxInflight=2 AddTestCase(new MultiLinkTxTest(baseParams, trafficPattern, WifiBaEnabled::YES, useBarAfterMissedBa, 2), - TestCase::QUICK); + TestCase::Duration::QUICK); } } @@ -3288,16 +3288,16 @@ WifiMultiLinkOperationsTestSuite::WifiMultiLinkOperationsTestSuite() // Block Ack agreement with nMaxInflight=1 AddTestCase( new MultiLinkMuTxTest(baseParams, muTrafficPattern, useBarAfterMissedBa, 1), - TestCase::QUICK); + TestCase::Duration::QUICK); // Block Ack agreement with nMaxInflight=2 AddTestCase( new MultiLinkMuTxTest(baseParams, muTrafficPattern, useBarAfterMissedBa, 2), - TestCase::QUICK); + TestCase::Duration::QUICK); } } } - AddTestCase(new ReleaseSeqNoAfterCtsTimeoutTest(), TestCase::QUICK); + AddTestCase(new ReleaseSeqNoAfterCtsTimeoutTest(), TestCase::Duration::QUICK); } static WifiMultiLinkOperationsTestSuite g_wifiMultiLinkOperationsTestSuite; ///< the test suite diff --git a/src/wifi/test/wifi-non-ht-dup-test.cc b/src/wifi/test/wifi-non-ht-dup-test.cc index 89616d57e..e704aa9af 100644 --- a/src/wifi/test/wifi-non-ht-dup-test.cc +++ b/src/wifi/test/wifi-non-ht-dup-test.cc @@ -1088,7 +1088,7 @@ WifiNonHtDuplicateTestSuite::WifiNonHtDuplicateTestSuite() {{WIFI_STANDARD_80211a, 5180, 0}, {WIFI_STANDARD_80211n, 5200, 0}, {WIFI_STANDARD_80211ac, 5230, 0}}), - TestCase::QUICK); + TestCase::Duration::QUICK); /* same channel map and test scenario as previously but inject interference on channel 40 */ AddTestCase(new TestNonHtDuplicatePhyReception(WIFI_STANDARD_80211ax, 5210, @@ -1097,35 +1097,44 @@ WifiNonHtDuplicateTestSuite::WifiNonHtDuplicateTestSuite() {WIFI_STANDARD_80211n, 5200, 0}, {WIFI_STANDARD_80211ac, 5230, 0}}, {false, true, false, false}), - TestCase::QUICK); + TestCase::Duration::QUICK); /* test PHY reception of multiple CTS responses following a MU-RTS */ /* 4 STAs operating on 20 MHz */ - AddTestCase(new TestMultipleCtsResponsesFromMuRts({{20}, {20}, {20}, {20}}), TestCase::QUICK); + AddTestCase(new TestMultipleCtsResponsesFromMuRts({{20}, {20}, {20}, {20}}), + TestCase::Duration::QUICK); /* 4 STAs operating on 40 MHz */ - AddTestCase(new TestMultipleCtsResponsesFromMuRts({{40}, {40}, {40}, {40}}), TestCase::QUICK); + AddTestCase(new TestMultipleCtsResponsesFromMuRts({{40}, {40}, {40}, {40}}), + TestCase::Duration::QUICK); /* 4 STAs operating on 80 MHz */ - AddTestCase(new TestMultipleCtsResponsesFromMuRts({{80}, {80}, {80}, {80}}), TestCase::QUICK); + AddTestCase(new TestMultipleCtsResponsesFromMuRts({{80}, {80}, {80}, {80}}), + TestCase::Duration::QUICK); /* 4 STAs operating on 160 MHz */ AddTestCase(new TestMultipleCtsResponsesFromMuRts({{160}, {160}, {160}, {160}}), - TestCase::QUICK); + TestCase::Duration::QUICK); /* 4 STAs operating on different bandwidths with PPDUs sent with decreasing BW: 160, 80, 40 and * 20 MHz */ - AddTestCase(new TestMultipleCtsResponsesFromMuRts({{160}, {80}, {40}, {20}}), TestCase::QUICK); + AddTestCase(new TestMultipleCtsResponsesFromMuRts({{160}, {80}, {40}, {20}}), + TestCase::Duration::QUICK); /* 4 STAs operating on different bandwidths with PPDUs sent with increasing BW: 20, 40, 80 and * 160 MHz */ - AddTestCase(new TestMultipleCtsResponsesFromMuRts({{20}, {40}, {80}, {160}}), TestCase::QUICK); + AddTestCase(new TestMultipleCtsResponsesFromMuRts({{20}, {40}, {80}, {160}}), + TestCase::Duration::QUICK); /* 2 STAs operating on different bandwidths with PPDUs sent with decreasing BW but the first STA * does not respond */ - AddTestCase(new TestMultipleCtsResponsesFromMuRts({{80, true}, {40, false}}), TestCase::QUICK); + AddTestCase(new TestMultipleCtsResponsesFromMuRts({{80, true}, {40, false}}), + TestCase::Duration::QUICK); /* 2 STAs operating on different bandwidths with PPDUs sent with decreasing BW but the second * STA does not respond */ - AddTestCase(new TestMultipleCtsResponsesFromMuRts({{80, false}, {40, true}}), TestCase::QUICK); + AddTestCase(new TestMultipleCtsResponsesFromMuRts({{80, false}, {40, true}}), + TestCase::Duration::QUICK); /* 2 STAs operating on different bandwidths with PPDUs sent with increasing BW but the first STA * does not respond */ - AddTestCase(new TestMultipleCtsResponsesFromMuRts({{40, true}, {80, false}}), TestCase::QUICK); + AddTestCase(new TestMultipleCtsResponsesFromMuRts({{40, true}, {80, false}}), + TestCase::Duration::QUICK); /* 2 STAs operating on different bandwidths with PPDUs sent with increasing BW but the second * STA does not respond */ - AddTestCase(new TestMultipleCtsResponsesFromMuRts({{40, false}, {80, true}}), TestCase::QUICK); + AddTestCase(new TestMultipleCtsResponsesFromMuRts({{40, false}, {80, true}}), + TestCase::Duration::QUICK); } static WifiNonHtDuplicateTestSuite wifiNonHtDuplicateTestSuite; ///< the test suite diff --git a/src/wifi/test/wifi-phy-cca-test.cc b/src/wifi/test/wifi-phy-cca-test.cc index 2b8a516a2..13924c4fa 100644 --- a/src/wifi/test/wifi-phy-cca-test.cc +++ b/src/wifi/test/wifi-phy-cca-test.cc @@ -2944,8 +2944,8 @@ class WifiPhyCcaTestSuite : public TestSuite WifiPhyCcaTestSuite::WifiPhyCcaTestSuite() : TestSuite("wifi-phy-cca", UNIT) { - AddTestCase(new WifiPhyCcaThresholdsTest, TestCase::QUICK); - AddTestCase(new WifiPhyCcaIndicationTest, TestCase::QUICK); + AddTestCase(new WifiPhyCcaThresholdsTest, TestCase::Duration::QUICK); + AddTestCase(new WifiPhyCcaIndicationTest, TestCase::Duration::QUICK); } static WifiPhyCcaTestSuite WifiPhyCcaTestSuite; ///< the test suite diff --git a/src/wifi/test/wifi-phy-mu-mimo-test.cc b/src/wifi/test/wifi-phy-mu-mimo-test.cc index bf591b0c9..b1399b244 100644 --- a/src/wifi/test/wifi-phy-mu-mimo-test.cc +++ b/src/wifi/test/wifi-phy-mu-mimo-test.cc @@ -1862,9 +1862,9 @@ class WifiPhyMuMimoTestSuite : public TestSuite WifiPhyMuMimoTestSuite::WifiPhyMuMimoTestSuite() : TestSuite("wifi-phy-mu-mimo", UNIT) { - AddTestCase(new TestDlMuTxVector, TestCase::QUICK); - AddTestCase(new TestDlMuMimoPhyTransmission, TestCase::QUICK); - AddTestCase(new TestUlMuMimoPhyTransmission, TestCase::QUICK); + AddTestCase(new TestDlMuTxVector, TestCase::Duration::QUICK); + AddTestCase(new TestDlMuMimoPhyTransmission, TestCase::Duration::QUICK); + AddTestCase(new TestUlMuMimoPhyTransmission, TestCase::Duration::QUICK); } static WifiPhyMuMimoTestSuite WifiPhyMuMimoTestSuite; ///< the test suite diff --git a/src/wifi/test/wifi-phy-ofdma-test.cc b/src/wifi/test/wifi-phy-ofdma-test.cc index 5a02fbafe..14c85d87b 100644 --- a/src/wifi/test/wifi-phy-ofdma-test.cc +++ b/src/wifi/test/wifi-phy-ofdma-test.cc @@ -5840,13 +5840,13 @@ class WifiPhyOfdmaTestSuite : public TestSuite WifiPhyOfdmaTestSuite::WifiPhyOfdmaTestSuite() : TestSuite("wifi-phy-ofdma", UNIT) { - AddTestCase(new TestDlOfdmaPhyTransmission, TestCase::QUICK); - AddTestCase(new TestDlOfdmaPhyPuncturing, TestCase::QUICK); - AddTestCase(new TestUlOfdmaPpduUid, TestCase::QUICK); - AddTestCase(new TestMultipleHeTbPreambles, TestCase::QUICK); - AddTestCase(new TestUlOfdmaPhyTransmission, TestCase::QUICK); - AddTestCase(new TestPhyPaddingExclusion, TestCase::QUICK); - AddTestCase(new TestUlOfdmaPowerControl, TestCase::QUICK); + AddTestCase(new TestDlOfdmaPhyTransmission, TestCase::Duration::QUICK); + AddTestCase(new TestDlOfdmaPhyPuncturing, TestCase::Duration::QUICK); + AddTestCase(new TestUlOfdmaPpduUid, TestCase::Duration::QUICK); + AddTestCase(new TestMultipleHeTbPreambles, TestCase::Duration::QUICK); + AddTestCase(new TestUlOfdmaPhyTransmission, TestCase::Duration::QUICK); + AddTestCase(new TestPhyPaddingExclusion, TestCase::Duration::QUICK); + AddTestCase(new TestUlOfdmaPowerControl, TestCase::Duration::QUICK); } static WifiPhyOfdmaTestSuite wifiPhyOfdmaTestSuite; ///< the test suite diff --git a/src/wifi/test/wifi-phy-reception-test.cc b/src/wifi/test/wifi-phy-reception-test.cc index a589eab6b..bc720cf01 100644 --- a/src/wifi/test/wifi-phy-reception-test.cc +++ b/src/wifi/test/wifi-phy-reception-test.cc @@ -4863,22 +4863,22 @@ class WifiPhyReceptionTestSuite : public TestSuite WifiPhyReceptionTestSuite::WifiPhyReceptionTestSuite() : TestSuite("wifi-phy-reception", UNIT) { - AddTestCase(new TestThresholdPreambleDetectionWithoutFrameCapture, TestCase::QUICK); - AddTestCase(new TestThresholdPreambleDetectionWithFrameCapture, TestCase::QUICK); - AddTestCase(new TestSimpleFrameCaptureModel, TestCase::QUICK); - AddTestCase(new TestPhyHeadersReception, TestCase::QUICK); - AddTestCase(new TestAmpduReception, TestCase::QUICK); - AddTestCase(new TestUnsupportedModulationReception(), TestCase::QUICK); - AddTestCase(new TestUnsupportedBandwidthReception(), TestCase::QUICK); - AddTestCase(new TestPrimary20CoveredByPpdu(), TestCase::QUICK); + AddTestCase(new TestThresholdPreambleDetectionWithoutFrameCapture, TestCase::Duration::QUICK); + AddTestCase(new TestThresholdPreambleDetectionWithFrameCapture, TestCase::Duration::QUICK); + AddTestCase(new TestSimpleFrameCaptureModel, TestCase::Duration::QUICK); + AddTestCase(new TestPhyHeadersReception, TestCase::Duration::QUICK); + AddTestCase(new TestAmpduReception, TestCase::Duration::QUICK); + AddTestCase(new TestUnsupportedModulationReception(), TestCase::Duration::QUICK); + AddTestCase(new TestUnsupportedBandwidthReception(), TestCase::Duration::QUICK); + AddTestCase(new TestPrimary20CoveredByPpdu(), TestCase::Duration::QUICK); // The below three test cases are related. The test involves a receiver tuned to // channel 36 and a transmitter sending on channels 36, 40, and 44, respectively. // The second argument corresponds to the number of signals expected to be received. // Signals on channel 36 and 40 will fall within the receiver bandwidth, while // a signal on channel 44 will fall completely outside and will be filtered. - AddTestCase(new TestSpectrumChannelWithBandwidthFilter(36, 1), TestCase::QUICK); - AddTestCase(new TestSpectrumChannelWithBandwidthFilter(40, 1), TestCase::QUICK); - AddTestCase(new TestSpectrumChannelWithBandwidthFilter(44, 0), TestCase::QUICK); + AddTestCase(new TestSpectrumChannelWithBandwidthFilter(36, 1), TestCase::Duration::QUICK); + AddTestCase(new TestSpectrumChannelWithBandwidthFilter(40, 1), TestCase::Duration::QUICK); + AddTestCase(new TestSpectrumChannelWithBandwidthFilter(44, 0), TestCase::Duration::QUICK); } static WifiPhyReceptionTestSuite wifiPhyReceptionTestSuite; ///< the test suite diff --git a/src/wifi/test/wifi-phy-thresholds-test.cc b/src/wifi/test/wifi-phy-thresholds-test.cc index 5141e1c33..a7d750d2e 100644 --- a/src/wifi/test/wifi-phy-thresholds-test.cc +++ b/src/wifi/test/wifi-phy-thresholds-test.cc @@ -501,10 +501,10 @@ class WifiPhyThresholdsTestSuite : public TestSuite WifiPhyThresholdsTestSuite::WifiPhyThresholdsTestSuite() : TestSuite("wifi-phy-thresholds", UNIT) { - AddTestCase(new WifiPhyThresholdsWeakWifiSignalTest, TestCase::QUICK); - AddTestCase(new WifiPhyThresholdsWeakForeignSignalTest, TestCase::QUICK); - AddTestCase(new WifiPhyThresholdsStrongWifiSignalTest, TestCase::QUICK); - AddTestCase(new WifiPhyThresholdsStrongForeignSignalTest, TestCase::QUICK); + AddTestCase(new WifiPhyThresholdsWeakWifiSignalTest, TestCase::Duration::QUICK); + AddTestCase(new WifiPhyThresholdsWeakForeignSignalTest, TestCase::Duration::QUICK); + AddTestCase(new WifiPhyThresholdsStrongWifiSignalTest, TestCase::Duration::QUICK); + AddTestCase(new WifiPhyThresholdsStrongForeignSignalTest, TestCase::Duration::QUICK); } static WifiPhyThresholdsTestSuite wifiPhyThresholdsTestSuite; ///< the test suite diff --git a/src/wifi/test/wifi-primary-channels-test.cc b/src/wifi/test/wifi-primary-channels-test.cc index 97db7cb1f..a1c2dd6bc 100644 --- a/src/wifi/test/wifi-primary-channels-test.cc +++ b/src/wifi/test/wifi-primary-channels-test.cc @@ -1373,16 +1373,16 @@ WifiPrimaryChannelsTestSuite::WifiPrimaryChannelsTestSuite() : TestSuite("wifi-primary-channels", UNIT) { // Test cases for 20 MHz can be added, but are not that useful (there would be a single BSS) - AddTestCase(new WifiPrimaryChannelsTest(40, true), TestCase::QUICK); - AddTestCase(new WifiPrimaryChannelsTest(40, false), TestCase::QUICK); + AddTestCase(new WifiPrimaryChannelsTest(40, true), TestCase::Duration::QUICK); + AddTestCase(new WifiPrimaryChannelsTest(40, false), TestCase::Duration::QUICK); #if 0 // Tests disabled until issue #776 resolved - AddTestCase(new WifiPrimaryChannelsTest(80, true), TestCase::EXTENSIVE); - AddTestCase(new WifiPrimaryChannelsTest(80, false), TestCase::EXTENSIVE); - AddTestCase(new WifiPrimaryChannelsTest(160, true), TestCase::TAKES_FOREVER); - AddTestCase(new WifiPrimaryChannelsTest(160, false), TestCase::TAKES_FOREVER); + AddTestCase(new WifiPrimaryChannelsTest(80, true), TestCase::Duration::EXTENSIVE); + AddTestCase(new WifiPrimaryChannelsTest(80, false), TestCase::Duration::EXTENSIVE); + AddTestCase(new WifiPrimaryChannelsTest(160, true), TestCase::Duration::TAKES_FOREVER); + AddTestCase(new WifiPrimaryChannelsTest(160, false), TestCase::Duration::TAKES_FOREVER); #endif - AddTestCase(new Wifi20MHzChannelIndicesTest(), TestCase::QUICK); + AddTestCase(new Wifi20MHzChannelIndicesTest(), TestCase::Duration::QUICK); } static WifiPrimaryChannelsTestSuite g_wifiPrimaryChannelsTestSuite; ///< the test suite diff --git a/src/wifi/test/wifi-ru-allocation-test.cc b/src/wifi/test/wifi-ru-allocation-test.cc index 75a8f940b..5bfd33d9a 100644 --- a/src/wifi/test/wifi-ru-allocation-test.cc +++ b/src/wifi/test/wifi-ru-allocation-test.cc @@ -690,7 +690,7 @@ class WifiRuAllocationTestSuite : public TestSuite WifiRuAllocationTestSuite::WifiRuAllocationTestSuite() : TestSuite("wifi-ru-allocation", UNIT) { - AddTestCase(new Wifi20MHzIndicesCoveringRuTest(), TestCase::QUICK); + AddTestCase(new Wifi20MHzIndicesCoveringRuTest(), TestCase::Duration::QUICK); } static WifiRuAllocationTestSuite g_wifiRuAllocationTestSuite; ///< the test suite diff --git a/src/wifi/test/wifi-test.cc b/src/wifi/test/wifi-test.cc index 5c0601cfc..64d39b67d 100644 --- a/src/wifi/test/wifi-test.cc +++ b/src/wifi/test/wifi-test.cc @@ -3793,24 +3793,24 @@ class WifiTestSuite : public TestSuite WifiTestSuite::WifiTestSuite() : TestSuite("wifi-devices", UNIT) { - AddTestCase(new WifiTest, TestCase::QUICK); - AddTestCase(new QosUtilsIsOldPacketTest, TestCase::QUICK); - AddTestCase(new InterferenceHelperSequenceTest, TestCase::QUICK); // Bug 991 - AddTestCase(new DcfImmediateAccessBroadcastTestCase, TestCase::QUICK); - AddTestCase(new Bug730TestCase, TestCase::QUICK); // Bug 730 - AddTestCase(new QosFragmentationTestCase, TestCase::QUICK); - AddTestCase(new SetChannelFrequencyTest, TestCase::QUICK); - AddTestCase(new Bug2222TestCase, TestCase::QUICK); // Bug 2222 - AddTestCase(new Bug2843TestCase, TestCase::QUICK); // Bug 2843 - AddTestCase(new Bug2831TestCase, TestCase::QUICK); // Bug 2831 - AddTestCase(new StaWifiMacScanningTestCase, TestCase::QUICK); // Bug 2399 - AddTestCase(new Bug2470TestCase, TestCase::QUICK); // Bug 2470 - AddTestCase(new Issue40TestCase, TestCase::QUICK); // Issue #40 - AddTestCase(new Issue169TestCase, TestCase::QUICK); // Issue #169 - AddTestCase(new IdealRateManagerChannelWidthTest, TestCase::QUICK); - AddTestCase(new IdealRateManagerMimoTest, TestCase::QUICK); - AddTestCase(new HeRuMcsDataRateTestCase, TestCase::QUICK); - AddTestCase(new WifiMgtHeaderTest, TestCase::QUICK); + AddTestCase(new WifiTest, TestCase::Duration::QUICK); + AddTestCase(new QosUtilsIsOldPacketTest, TestCase::Duration::QUICK); + AddTestCase(new InterferenceHelperSequenceTest, TestCase::Duration::QUICK); // Bug 991 + AddTestCase(new DcfImmediateAccessBroadcastTestCase, TestCase::Duration::QUICK); + AddTestCase(new Bug730TestCase, TestCase::Duration::QUICK); // Bug 730 + AddTestCase(new QosFragmentationTestCase, TestCase::Duration::QUICK); + AddTestCase(new SetChannelFrequencyTest, TestCase::Duration::QUICK); + AddTestCase(new Bug2222TestCase, TestCase::Duration::QUICK); // Bug 2222 + AddTestCase(new Bug2843TestCase, TestCase::Duration::QUICK); // Bug 2843 + AddTestCase(new Bug2831TestCase, TestCase::Duration::QUICK); // Bug 2831 + AddTestCase(new StaWifiMacScanningTestCase, TestCase::Duration::QUICK); // Bug 2399 + AddTestCase(new Bug2470TestCase, TestCase::Duration::QUICK); // Bug 2470 + AddTestCase(new Issue40TestCase, TestCase::Duration::QUICK); // Issue #40 + AddTestCase(new Issue169TestCase, TestCase::Duration::QUICK); // Issue #169 + AddTestCase(new IdealRateManagerChannelWidthTest, TestCase::Duration::QUICK); + AddTestCase(new IdealRateManagerMimoTest, TestCase::Duration::QUICK); + AddTestCase(new HeRuMcsDataRateTestCase, TestCase::Duration::QUICK); + AddTestCase(new WifiMgtHeaderTest, TestCase::Duration::QUICK); } static WifiTestSuite g_wifiTestSuite; ///< the test suite diff --git a/src/wifi/test/wifi-transmit-mask-test.cc b/src/wifi/test/wifi-transmit-mask-test.cc index 261d02340..23590b3e9 100644 --- a/src/wifi/test/wifi-transmit-mask-test.cc +++ b/src/wifi/test/wifi-transmit-mask-test.cc @@ -362,7 +362,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() maskSlopes, tol, prec), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11p 10MHz @@ -393,7 +393,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() maskSlopes, tol, prec), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11a @@ -424,7 +424,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() maskSlopes, tol, prec), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11g @@ -437,7 +437,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() maskSlopes, tol, prec), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11n 20MHz @ 2.4GHz @@ -468,7 +468,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() maskSlopes, tol, prec), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11n 20MHz @ 5GHz @@ -499,7 +499,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() maskSlopes, tol, prec), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11n 40MHz @ 2.4GHz @@ -530,7 +530,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() maskSlopes, tol, prec), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11n 20MHz @ 5GHz @@ -561,7 +561,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() maskSlopes, tol, prec), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11ac 20MHz @@ -592,7 +592,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() maskSlopes, tol, prec), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11ac 20MHz @@ -623,7 +623,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() maskSlopes, tol, prec), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11ac 80MHz @@ -654,7 +654,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() maskSlopes, tol, prec), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11ac 20MHz @@ -685,7 +685,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() maskSlopes, tol, prec), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11ax 20MHz @ 2.4GHz @@ -722,7 +722,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() maskSlopes, tol, prec), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11ax 20MHz @ 5GHz @@ -759,7 +759,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() maskSlopes, tol, prec), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11ax 40MHz @ 2.4GHz @@ -796,7 +796,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() maskSlopes, tol, prec), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11ax 40MHz @ 5GHz @@ -833,7 +833,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() maskSlopes, tol, prec), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11ax 80MHz @ 2.4GHz @@ -870,7 +870,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() maskSlopes, tol, prec), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11ax 80MHz @ 5GHz @@ -907,7 +907,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() maskSlopes, tol, prec), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11ax 160MHz @ 2.4GHz -> not enough space so skip @@ -955,7 +955,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() maskSlopes, tol, prec), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11ax 80MHz @ 5GHz - first 20 MHz subchannel punctured @@ -995,7 +995,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() tol, prec, {true, false, false, false}), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11ax 80MHz @ 5GHz - second 20 MHz subchannel punctured @@ -1039,7 +1039,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() tol, prec, {false, true, false, false}), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11ax 80MHz @ 5GHz - third 20 MHz subchannel punctured @@ -1083,7 +1083,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() tol, prec, {false, false, true, false}), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11ax 80MHz @ 5GHz - last 20 MHz subchannel punctured @@ -1123,7 +1123,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() tol, prec, {false, false, false, true}), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11ax 160MHz @ 5GHz - first two 20 MHz subchannels punctured @@ -1171,7 +1171,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() tol, prec, {true, true, false, false, false, false, false, false}), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11ax 160MHz @ 5GHz - third and fourth 20 MHz subchannels punctured @@ -1221,7 +1221,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() tol, prec, {false, false, true, true, false, false, false, false}), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11ax 160MHz @ 5GHz - fifth and sixth 20 MHz subchannels punctured @@ -1271,7 +1271,7 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() tol, prec, {false, false, false, false, true, true, false, false}), - TestCase::QUICK); + TestCase::Duration::QUICK); // ============================================================================================ // 11ax 160MHz @ 5GHz - last two 20 MHz subchannels punctured @@ -1319,5 +1319,5 @@ WifiTransmitMaskTestSuite::WifiTransmitMaskTestSuite() tol, prec, {false, false, false, false, false, false, true, true}), - TestCase::QUICK); + TestCase::Duration::QUICK); } diff --git a/src/wifi/test/wifi-txop-test.cc b/src/wifi/test/wifi-txop-test.cc index 3957839c5..c45ec4728 100644 --- a/src/wifi/test/wifi-txop-test.cc +++ b/src/wifi/test/wifi-txop-test.cc @@ -850,8 +850,8 @@ class WifiTxopTestSuite : public TestSuite WifiTxopTestSuite::WifiTxopTestSuite() : TestSuite("wifi-txop", UNIT) { - AddTestCase(new WifiTxopTest(true), TestCase::QUICK); - AddTestCase(new WifiTxopTest(false), TestCase::QUICK); + AddTestCase(new WifiTxopTest(true), TestCase::Duration::QUICK); + AddTestCase(new WifiTxopTest(false), TestCase::Duration::QUICK); } static WifiTxopTestSuite g_wifiTxopTestSuite; ///< the test suite diff --git a/src/wimax/test/mac-messages-test.cc b/src/wimax/test/mac-messages-test.cc index cbac42629..4edd3f8ec 100644 --- a/src/wimax/test/mac-messages-test.cc +++ b/src/wimax/test/mac-messages-test.cc @@ -125,7 +125,7 @@ class Ns3WimaxMacMessagesTestSuite : public TestSuite Ns3WimaxMacMessagesTestSuite::Ns3WimaxMacMessagesTestSuite() : TestSuite("wimax-mac-messages", UNIT) { - AddTestCase(new DsaRequestTestCase, TestCase::QUICK); + AddTestCase(new DsaRequestTestCase, TestCase::Duration::QUICK); } static Ns3WimaxMacMessagesTestSuite ns3WimaxMacMessagesTestSuite; ///< the test suite diff --git a/src/wimax/test/phy-test.cc b/src/wimax/test/phy-test.cc index 4a376cb85..4b22d72b2 100644 --- a/src/wimax/test/phy-test.cc +++ b/src/wimax/test/phy-test.cc @@ -190,8 +190,8 @@ class Ns3WimaxPhyTestSuite : public TestSuite Ns3WimaxPhyTestSuite::Ns3WimaxPhyTestSuite() : TestSuite("wimax-phy-layer", UNIT) { - AddTestCase(new Ns3WimaxSNRtoBLERTestCase, TestCase::QUICK); - AddTestCase(new Ns3WimaxSimpleOFDMTestCase, TestCase::QUICK); + AddTestCase(new Ns3WimaxSNRtoBLERTestCase, TestCase::Duration::QUICK); + AddTestCase(new Ns3WimaxSimpleOFDMTestCase, TestCase::Duration::QUICK); } static Ns3WimaxPhyTestSuite ns3WimaxPhyTestSuite; ///< the test suite diff --git a/src/wimax/test/qos-test.cc b/src/wimax/test/qos-test.cc index bc5afb25d..4682aad49 100644 --- a/src/wimax/test/qos-test.cc +++ b/src/wimax/test/qos-test.cc @@ -313,8 +313,8 @@ class Ns3WimaxQoSTestSuite : public TestSuite Ns3WimaxQoSTestSuite::Ns3WimaxQoSTestSuite() : TestSuite("wimax-qos", SYSTEM) { - AddTestCase(new Ns3WimaxSFTypeTestCase, TestCase::QUICK); - AddTestCase(new Ns3WimaxSchedulingTestCase, TestCase::QUICK); + AddTestCase(new Ns3WimaxSFTypeTestCase, TestCase::Duration::QUICK); + AddTestCase(new Ns3WimaxSchedulingTestCase, TestCase::Duration::QUICK); } static Ns3WimaxQoSTestSuite ns3WimaxQoSTestSuite; ///< the test suite diff --git a/src/wimax/test/ss-mac-test.cc b/src/wimax/test/ss-mac-test.cc index 18c0eb8d3..e36627309 100644 --- a/src/wimax/test/ss-mac-test.cc +++ b/src/wimax/test/ss-mac-test.cc @@ -168,8 +168,8 @@ class Ns3WimaxSSMacTestSuite : public TestSuite Ns3WimaxSSMacTestSuite::Ns3WimaxSSMacTestSuite() : TestSuite("wimax-ss-mac-layer", UNIT) { - AddTestCase(new Ns3WimaxNetworkEntryTestCase, TestCase::QUICK); - AddTestCase(new Ns3WimaxManagementConnectionsTestCase, TestCase::QUICK); + AddTestCase(new Ns3WimaxNetworkEntryTestCase, TestCase::Duration::QUICK); + AddTestCase(new Ns3WimaxManagementConnectionsTestCase, TestCase::Duration::QUICK); } static Ns3WimaxSSMacTestSuite ns3WimaxSSMacTestSuite; ///< the test suite diff --git a/src/wimax/test/wimax-fragmentation-test.cc b/src/wimax/test/wimax-fragmentation-test.cc index e4bdd0c9f..c6be5f6fb 100644 --- a/src/wimax/test/wimax-fragmentation-test.cc +++ b/src/wimax/test/wimax-fragmentation-test.cc @@ -157,7 +157,7 @@ class Ns3WimaxFragmentationTestSuite : public TestSuite Ns3WimaxFragmentationTestSuite::Ns3WimaxFragmentationTestSuite() : TestSuite("wimax-fragmentation", UNIT) { - AddTestCase(new Ns3WimaxFragmentationTestCase, TestCase::QUICK); + AddTestCase(new Ns3WimaxFragmentationTestCase, TestCase::Duration::QUICK); } static Ns3WimaxFragmentationTestSuite ns3WimaxFragmentationTestSuite; ///< the test suite diff --git a/src/wimax/test/wimax-service-flow-test.cc b/src/wimax/test/wimax-service-flow-test.cc index b7f8ce888..9461156a6 100644 --- a/src/wimax/test/wimax-service-flow-test.cc +++ b/src/wimax/test/wimax-service-flow-test.cc @@ -165,7 +165,7 @@ class Ns3WimaxServiceFlowTestSuite : public TestSuite Ns3WimaxServiceFlowTestSuite::Ns3WimaxServiceFlowTestSuite() : TestSuite("wimax-service-flow", UNIT) { - AddTestCase(new Ns3WimaxSfCreationTestCase, TestCase::QUICK); + AddTestCase(new Ns3WimaxSfCreationTestCase, TestCase::Duration::QUICK); } static Ns3WimaxServiceFlowTestSuite ns3WimaxServiceFlowTestSuite; ///< the test suite diff --git a/src/wimax/test/wimax-tlv-test.cc b/src/wimax/test/wimax-tlv-test.cc index 429f54fd6..dbb8b10c3 100644 --- a/src/wimax/test/wimax-tlv-test.cc +++ b/src/wimax/test/wimax-tlv-test.cc @@ -226,8 +226,8 @@ class Ns3WimaxTlvTestSuite : public TestSuite Ns3WimaxTlvTestSuite::Ns3WimaxTlvTestSuite() : TestSuite("wimax-tlv", UNIT) { - AddTestCase(new Ns3WimaxCsParamTlvTestCase, TestCase::QUICK); - AddTestCase(new Ns3WimaxSfTlvTestCase, TestCase::QUICK); + AddTestCase(new Ns3WimaxCsParamTlvTestCase, TestCase::Duration::QUICK); + AddTestCase(new Ns3WimaxSfTlvTestCase, TestCase::Duration::QUICK); } static Ns3WimaxTlvTestSuite ns3WimaxTlvTestSuite; ///< the test suite diff --git a/utils/create-module.py b/utils/create-module.py index 31f9d14c0..4879e18de 100755 --- a/utils/create-module.py +++ b/utils/create-module.py @@ -216,8 +216,8 @@ class {CAPITALIZED}TestSuite : public TestSuite {CAPITALIZED}TestSuite::{CAPITALIZED}TestSuite() : TestSuite("{MODULE}", UNIT) {{ - // TestDuration for TestCase can be QUICK, EXTENSIVE or TAKES_FOREVER - AddTestCase(new {CAPITALIZED}TestCase1, TestCase::QUICK); + // Duration for TestCase can be QUICK, EXTENSIVE or TAKES_FOREVER + AddTestCase(new {CAPITALIZED}TestCase1, TestCase::Duration::QUICK); }} // Do not forget to allocate an instance of this TestSuite