From d53c6eee059b0eb0e5652837dcaab0b8b3e9032d Mon Sep 17 00:00:00 2001 From: Nicola Baldo Date: Tue, 29 May 2012 13:56:26 +0200 Subject: [PATCH] fixed Bug 1439 - exclude headers for tests from installation --- .../test/building-position-allocator-test.cc | 5 ++++- src/buildings/test/buildings-helper-test.cc | 5 ++++- src/buildings/test/buildings-pathloss-test.cc | 7 ++++--- .../test/buildings-shadowing-test.cc | 11 ++++++----- src/buildings/wscript | 2 -- src/lte/test/epc-test-gtpu.cc | 9 ++++++--- src/lte/test/epc-test-gtpu.h | 5 ++++- src/lte/test/lte-simple-helper.cc | 6 +++++- src/lte/test/lte-simple-helper.h | 4 ++-- src/lte/test/lte-simple-net-device.cc | 2 +- src/lte/test/lte-test-downlink-sinr.cc | 10 +++++++--- src/lte/test/lte-test-downlink-sinr.h | 5 ++++- src/lte/test/lte-test-entities.cc | 7 +++++-- src/lte/test/lte-test-entities.h | 4 +++- src/lte/test/lte-test-fading.cc | 5 ++++- src/lte/test/lte-test-fading.h | 5 ++++- src/lte/test/lte-test-interference.cc | 7 +++++-- src/lte/test/lte-test-interference.h | 5 ++++- src/lte/test/lte-test-link-adaptation.cc | 7 +++++-- src/lte/test/lte-test-link-adaptation.h | 5 ++++- src/lte/test/lte-test-mimo.cc | 8 ++++++-- src/lte/test/lte-test-mimo.h | 5 ++++- src/lte/test/lte-test-pathloss-model.cc | 13 +++++++++---- src/lte/test/lte-test-pathloss-model.h | 5 ++++- src/lte/test/lte-test-pf-ff-mac-scheduler.cc | 7 +++++-- src/lte/test/lte-test-pf-ff-mac-scheduler.h | 5 ++++- src/lte/test/lte-test-phy-error-model.cc | 7 +++++-- src/lte/test/lte-test-phy-error-model.h | 5 ++++- src/lte/test/lte-test-rlc-am-e2e.cc | 16 ++++++++-------- src/lte/test/lte-test-rlc-am-e2e.h | 5 ++++- src/lte/test/lte-test-rlc-am-transmitter.cc | 8 ++++++-- src/lte/test/lte-test-rlc-am-transmitter.h | 8 ++++++-- src/lte/test/lte-test-rlc-um-e2e.cc | 12 +++++++----- src/lte/test/lte-test-rlc-um-e2e.h | 5 ++++- src/lte/test/lte-test-rlc-um-transmitter.cc | 8 ++++++-- src/lte/test/lte-test-rlc-um-transmitter.h | 8 ++++++-- src/lte/test/lte-test-rr-ff-mac-scheduler.cc | 7 +++++-- src/lte/test/lte-test-rr-ff-mac-scheduler.h | 5 ++++- src/lte/test/lte-test-ue-phy.cc | 2 +- src/lte/test/lte-test-uplink-sinr.cc | 9 ++++++--- src/lte/test/lte-test-uplink-sinr.h | 5 ++++- src/lte/test/test-lte-antenna.cc | 6 +++++- src/lte/wscript | 19 ------------------- 43 files changed, 194 insertions(+), 100 deletions(-) diff --git a/src/buildings/test/building-position-allocator-test.cc b/src/buildings/test/building-position-allocator-test.cc index 653595f13..86965eda9 100644 --- a/src/buildings/test/building-position-allocator-test.cc +++ b/src/buildings/test/building-position-allocator-test.cc @@ -32,7 +32,7 @@ NS_LOG_COMPONENT_DEFINE ("BuildingPositionAllocatorTest"); -using namespace ns3; +namespace ns3 { @@ -237,3 +237,6 @@ BuildingPositionAllocatorTestSuite::BuildingPositionAllocatorTestSuite () } static BuildingPositionAllocatorTestSuite buildingsPositionAllocatorTestSuiteInstance; + +} // namespace ns3 + diff --git a/src/buildings/test/buildings-helper-test.cc b/src/buildings/test/buildings-helper-test.cc index 148dcd9a5..d974dd86d 100644 --- a/src/buildings/test/buildings-helper-test.cc +++ b/src/buildings/test/buildings-helper-test.cc @@ -30,7 +30,7 @@ NS_LOG_COMPONENT_DEFINE ("BuildingsHelperTest"); -using namespace ns3; +namespace ns3 { struct PositionInBuilding @@ -323,3 +323,6 @@ BuildingsHelperTestSuite::BuildingsHelperTestSuite () } static BuildingsHelperTestSuite buildingsHelperAntennaTestSuiteInstance; + +} // namespace ns3 + diff --git a/src/buildings/test/buildings-pathloss-test.cc b/src/buildings/test/buildings-pathloss-test.cc index ea546b344..41e94c5a7 100644 --- a/src/buildings/test/buildings-pathloss-test.cc +++ b/src/buildings/test/buildings-pathloss-test.cc @@ -24,12 +24,13 @@ #include #include -#include -#include "ns3/string.h" -#include "ns3/double.h" +#include +#include #include #include +#include "buildings-pathloss-test.h" + NS_LOG_COMPONENT_DEFINE ("BuildingsPathlossTest"); diff --git a/src/buildings/test/buildings-shadowing-test.cc b/src/buildings/test/buildings-shadowing-test.cc index bcf6c8740..4ee83f1a9 100644 --- a/src/buildings/test/buildings-shadowing-test.cc +++ b/src/buildings/test/buildings-shadowing-test.cc @@ -19,16 +19,17 @@ * Nicola Baldo */ -#include "ns3/simulator.h" -#include "ns3/log.h" -#include "ns3/buildings-shadowing-test.h" +#include +#include #include -#include "ns3/string.h" -#include "ns3/double.h" +#include +#include #include #include #include +#include "buildings-shadowing-test.h" + NS_LOG_COMPONENT_DEFINE ("BuildingsShadowingTest"); diff --git a/src/buildings/wscript b/src/buildings/wscript index cd0bdb944..e6d512deb 100644 --- a/src/buildings/wscript +++ b/src/buildings/wscript @@ -39,8 +39,6 @@ def build(bld): 'helper/building-allocator.h', 'helper/building-position-allocator.h', 'helper/buildings-helper.h', - 'test/buildings-pathloss-test.h', - 'test/buildings-shadowing-test.h', ] if (bld.env['ENABLE_EXAMPLES']): diff --git a/src/lte/test/epc-test-gtpu.cc b/src/lte/test/epc-test-gtpu.cc index 5bdadafe5..013af70a1 100644 --- a/src/lte/test/epc-test-gtpu.cc +++ b/src/lte/test/epc-test-gtpu.cc @@ -22,13 +22,13 @@ #include "ns3/log.h" #include "ns3/object.h" #include "ns3/packet.h" - #include "ns3/epc-gtpu-header.h" -#include "ns3/epc-test-gtpu.h" + +#include "epc-test-gtpu.h" NS_LOG_COMPONENT_DEFINE ("EpcGtpuTest"); -using namespace ns3; +namespace ns3 { /** @@ -84,3 +84,6 @@ EpsGtpuHeaderTestCase::DoRun (void) NS_TEST_ASSERT_MSG_EQ (h1, h2, "Wrong value!"); } + +} // namespace ns3 + diff --git a/src/lte/test/epc-test-gtpu.h b/src/lte/test/epc-test-gtpu.h index 8eb244df9..d417a48cf 100644 --- a/src/lte/test/epc-test-gtpu.h +++ b/src/lte/test/epc-test-gtpu.h @@ -26,7 +26,7 @@ #include "ns3/test.h" -using namespace ns3; +namespace ns3 { @@ -50,4 +50,7 @@ private: }; +} // namespace ns3 + + #endif /* EPC_TEST_GTPU_H */ diff --git a/src/lte/test/lte-simple-helper.cc b/src/lte/test/lte-simple-helper.cc index 74c2df59a..3e5a78cea 100644 --- a/src/lte/test/lte-simple-helper.cc +++ b/src/lte/test/lte-simple-helper.cc @@ -18,13 +18,17 @@ * Author: Manuel Requena (Based on lte-helper.cc) */ -#include "ns3/lte-simple-helper.h" + #include "ns3/log.h" #include "ns3/callback.h" #include "ns3/config.h" #include "ns3/simple-channel.h" #include "ns3/error-model.h" +#include "lte-simple-helper.h" +#include "lte-simple-net-device.h" +#include "lte-test-entities.h" + NS_LOG_COMPONENT_DEFINE ("LteSimpleHelper"); diff --git a/src/lte/test/lte-simple-helper.h b/src/lte/test/lte-simple-helper.h index 1425c4d1a..59e73c4b0 100644 --- a/src/lte/test/lte-simple-helper.h +++ b/src/lte/test/lte-simple-helper.h @@ -25,9 +25,7 @@ #include "ns3/simple-channel.h" #include "ns3/node-container.h" #include "ns3/radio-bearer-stats-calculator.h" -#include "ns3/lte-simple-net-device.h" -#include "ns3/lte-test-entities.h" #include "ns3/lte-pdcp.h" #include "ns3/lte-rlc.h" #include "ns3/lte-rlc-um.h" @@ -35,6 +33,8 @@ namespace ns3 { +class LteTestRrc; +class LteTestMac; /** * Creation and configuration of LTE entities diff --git a/src/lte/test/lte-simple-net-device.cc b/src/lte/test/lte-simple-net-device.cc index bcc58ed6b..16893f9dc 100644 --- a/src/lte/test/lte-simple-net-device.cc +++ b/src/lte/test/lte-simple-net-device.cc @@ -21,7 +21,7 @@ #include "ns3/simulator.h" #include "ns3/pointer.h" #include "ns3/log.h" -#include "ns3/lte-simple-net-device.h" +#include "lte-simple-net-device.h" NS_LOG_COMPONENT_DEFINE ("LteSimpleNetDevice"); diff --git a/src/lte/test/lte-test-downlink-sinr.cc b/src/lte/test/lte-test-downlink-sinr.cc index fdcf67d23..124180fa8 100644 --- a/src/lte/test/lte-test-downlink-sinr.cc +++ b/src/lte/test/lte-test-downlink-sinr.cc @@ -25,15 +25,16 @@ #include "ns3/spectrum-test.h" #include "ns3/lte-phy-tag.h" -#include "ns3/lte-test-ue-phy.h" #include "ns3/lte-sinr-chunk-processor.h" #include "ns3/lte-spectrum-signal-parameters.h" -#include "ns3/lte-test-downlink-sinr.h" +#include "lte-test-downlink-sinr.h" +#include "lte-test-ue-phy.h" + NS_LOG_COMPONENT_DEFINE ("LteDownlinkSinrTest"); -using namespace ns3; +namespace ns3 { /** @@ -266,3 +267,6 @@ LteDownlinkSinrTestCase::DoRun (void) dlPhy->Dispose (); Simulator::Destroy (); } + +} // namespace ns3 + diff --git a/src/lte/test/lte-test-downlink-sinr.h b/src/lte/test/lte-test-downlink-sinr.h index 68abbf19b..01431c0fb 100644 --- a/src/lte/test/lte-test-downlink-sinr.h +++ b/src/lte/test/lte-test-downlink-sinr.h @@ -26,7 +26,7 @@ #include "ns3/test.h" -using namespace ns3; +namespace ns3 { /** @@ -54,4 +54,7 @@ private: }; + +} // namespace ns3 + #endif /* LTE_TEST_DOWNLINK_SINR_H */ diff --git a/src/lte/test/lte-test-entities.cc b/src/lte/test/lte-test-entities.cc index 3dd49cda7..94fcac3dd 100644 --- a/src/lte/test/lte-test-entities.cc +++ b/src/lte/test/lte-test-entities.cc @@ -25,11 +25,11 @@ #include "ns3/lte-rlc-am-header.h" #include "ns3/lte-pdcp-header.h" -#include "ns3/lte-test-entities.h" +#include "lte-test-entities.h" NS_LOG_COMPONENT_DEFINE ("LteTestEntities"); -using namespace ns3; +namespace ns3 { ///////////////////////////////////////////////////////////////////// @@ -600,3 +600,6 @@ LteTestMac::Receive (Ptr nd, Ptr p, uint16_t protocol, m_macSapUser->ReceivePdu (packet); return true; } + +} // namespace ns3 + diff --git a/src/lte/test/lte-test-entities.h b/src/lte/test/lte-test-entities.h index d59c7b5a2..8ab42a7b3 100644 --- a/src/lte/test/lte-test-entities.h +++ b/src/lte/test/lte-test-entities.h @@ -31,8 +31,8 @@ #include "ns3/net-device.h" -using namespace ns3; +namespace ns3 { /** * This class implements a testing RRC entity @@ -261,4 +261,6 @@ class LteTestMac : public Object }; +} // namespace ns3 + #endif /* LTE_TEST_MAC_H */ diff --git a/src/lte/test/lte-test-fading.cc b/src/lte/test/lte-test-fading.cc index ecd7aded7..af185ae24 100644 --- a/src/lte/test/lte-test-fading.cc +++ b/src/lte/test/lte-test-fading.cc @@ -52,7 +52,7 @@ NS_LOG_COMPONENT_DEFINE ("LteFadingTest"); -using namespace ns3; +namespace ns3 { /** @@ -295,3 +295,6 @@ LteFadingTestCase::GetFadingSample () (*outPsd1)[1] = (10 * log10 (180000*(*outPsd1)[1])) - (10 * log10 (180000*(*inPsd1)[1])); m_fadingSamples.push_back ((*outPsd1)); } + +} // namespace ns3 + diff --git a/src/lte/test/lte-test-fading.h b/src/lte/test/lte-test-fading.h index 658d02a4e..1d20af40e 100644 --- a/src/lte/test/lte-test-fading.h +++ b/src/lte/test/lte-test-fading.h @@ -31,7 +31,7 @@ #include -using namespace ns3; +namespace ns3 { /** @@ -83,4 +83,7 @@ class LteFadingSystemTestCase : public TestCase uint16_t m_mcsIndex; }; +} // namespace ns3 + + #endif /*LTE_TEST_FADING_H*/ diff --git a/src/lte/test/lte-test-interference.cc b/src/lte/test/lte-test-interference.cc index ee8e8ddb9..9690d69b9 100644 --- a/src/lte/test/lte-test-interference.cc +++ b/src/lte/test/lte-test-interference.cc @@ -34,13 +34,13 @@ #include "ns3/lte-ue-phy.h" #include "ns3/lte-ue-net-device.h" -#include "ns3/lte-test-interference.h" +#include "lte-test-interference.h" #include "lte-test-sinr-chunk-processor.h" NS_LOG_COMPONENT_DEFINE ("LteInterferenceTest"); -using namespace ns3; +namespace ns3 { void @@ -252,3 +252,6 @@ LteInterferenceTestCase::UlScheduling (uint32_t frameNo, uint32_t subframeNo, ui NS_TEST_ASSERT_MSG_EQ ((uint16_t)mcs, m_ulMcs, "Wrong UL MCS"); } } + +} // namespace ns3 + diff --git a/src/lte/test/lte-test-interference.h b/src/lte/test/lte-test-interference.h index 7103eaa80..46ef0bdd9 100644 --- a/src/lte/test/lte-test-interference.h +++ b/src/lte/test/lte-test-interference.h @@ -25,7 +25,7 @@ #include "ns3/test.h" -using namespace ns3; +namespace ns3 { /** @@ -65,4 +65,7 @@ private: }; +} // namespace ns3 + + #endif /* LTE_TEST_INTERFERENCE_H */ diff --git a/src/lte/test/lte-test-link-adaptation.cc b/src/lte/test/lte-test-link-adaptation.cc index 929855d6d..91c34a153 100644 --- a/src/lte/test/lte-test-link-adaptation.cc +++ b/src/lte/test/lte-test-link-adaptation.cc @@ -30,13 +30,13 @@ #include "ns3/lte-ue-phy.h" #include "ns3/lte-ue-net-device.h" -#include "ns3/lte-test-link-adaptation.h" +#include "lte-test-link-adaptation.h" #include "lte-test-sinr-chunk-processor.h" NS_LOG_COMPONENT_DEFINE ("LteLinkAdaptationTest"); -using namespace ns3; +namespace ns3 { /** @@ -239,3 +239,6 @@ LteLinkAdaptationTestCase::DlScheduling (uint32_t frameNo, uint32_t subframeNo, NS_TEST_ASSERT_MSG_EQ ((uint16_t)mcsTb1, m_mcsIndex, "Wrong MCS index"); } } + +} // namespace ns3 + diff --git a/src/lte/test/lte-test-link-adaptation.h b/src/lte/test/lte-test-link-adaptation.h index 055f2d19f..cdca5684c 100644 --- a/src/lte/test/lte-test-link-adaptation.h +++ b/src/lte/test/lte-test-link-adaptation.h @@ -24,7 +24,7 @@ #include "ns3/test.h" -using namespace ns3; +namespace ns3 { /** @@ -56,4 +56,7 @@ private: }; +} // namespace ns3 + + #endif /* LTE_TEST_LINK_ADAPTATION_H */ diff --git a/src/lte/test/lte-test-mimo.cc b/src/lte/test/lte-test-mimo.cc index 4b1589e72..336bac7d7 100644 --- a/src/lte/test/lte-test-mimo.cc +++ b/src/lte/test/lte-test-mimo.cc @@ -34,7 +34,6 @@ #include "ns3/radio-bearer-stats-calculator.h" #include #include -#include "ns3/lte-test-mimo.h" #include #include #include @@ -53,10 +52,12 @@ #include #include +#include "lte-test-mimo.h" + NS_LOG_COMPONENT_DEFINE ("LenaTestMimo"); -using namespace ns3; +namespace ns3 { LenaTestMimoSuite::LenaTestMimoSuite () @@ -284,3 +285,6 @@ LenaMimoTestCase::GetRlcBufferSample (Ptr rlcStats, } + +} // namespace ns3 + diff --git a/src/lte/test/lte-test-mimo.h b/src/lte/test/lte-test-mimo.h index 060d87adc..bdfebc7fd 100644 --- a/src/lte/test/lte-test-mimo.h +++ b/src/lte/test/lte-test-mimo.h @@ -25,7 +25,7 @@ #include "ns3/test.h" -using namespace ns3; +namespace ns3 { /** @@ -64,4 +64,7 @@ public: +} // namespace ns3 + + #endif /* LENA_TEST_MIMO_H */ diff --git a/src/lte/test/lte-test-pathloss-model.cc b/src/lte/test/lte-test-pathloss-model.cc index 5b9a40846..a59fe2ba6 100644 --- a/src/lte/test/lte-test-pathloss-model.cc +++ b/src/lte/test/lte-test-pathloss-model.cc @@ -25,10 +25,9 @@ #include "ns3/spectrum-test.h" #include "ns3/lte-phy-tag.h" -#include "ns3/lte-test-ue-phy.h" #include "ns3/lte-sinr-chunk-processor.h" -#include "ns3/lte-test-pathloss-model.h" + #include #include #include @@ -45,11 +44,14 @@ #include #include #include -#include + +#include "lte-test-sinr-chunk-processor.h" +#include "lte-test-ue-phy.h" +#include "lte-test-pathloss-model.h" NS_LOG_COMPONENT_DEFINE ("LtePathlossModelTest"); -using namespace ns3; +namespace ns3 { /** @@ -310,3 +312,6 @@ LtePathlossModelSystemTestCase::DlScheduling (uint32_t frameNo, uint32_t subfram } } + +} // namespace ns3 + diff --git a/src/lte/test/lte-test-pathloss-model.h b/src/lte/test/lte-test-pathloss-model.h index 1b0d26215..103fcb80d 100644 --- a/src/lte/test/lte-test-pathloss-model.h +++ b/src/lte/test/lte-test-pathloss-model.h @@ -29,7 +29,7 @@ #include -using namespace ns3; +namespace ns3 { /** @@ -61,5 +61,8 @@ class LtePathlossModelSystemTestCase : public TestCase }; +} // namespace ns3 + + #endif /* LTE_TEST_PATHLOSS_MODEL_H */ 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 4b368eb10..2b03de968 100644 --- a/src/lte/test/lte-test-pf-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-pf-ff-mac-scheduler.cc @@ -33,7 +33,6 @@ #include #include "ns3/radio-bearer-stats-calculator.h" #include -#include "ns3/lte-test-pf-ff-mac-scheduler.h" #include #include #include @@ -49,10 +48,11 @@ #include #include +#include "lte-test-pf-ff-mac-scheduler.h" NS_LOG_COMPONENT_DEFINE ("LenaTestPfFfMacCheduler"); -using namespace ns3; +namespace ns3 { LenaTestPfFfMacSchedulerSuite::LenaTestPfFfMacSchedulerSuite () : TestSuite ("lte-pf-ff-mac-scheduler", SYSTEM) @@ -535,5 +535,8 @@ LenaPfFfMacSchedulerTestCase2::DoRun (void) } +} // namespace ns3 + + diff --git a/src/lte/test/lte-test-pf-ff-mac-scheduler.h b/src/lte/test/lte-test-pf-ff-mac-scheduler.h index 6dea9d18d..de82a840b 100644 --- a/src/lte/test/lte-test-pf-ff-mac-scheduler.h +++ b/src/lte/test/lte-test-pf-ff-mac-scheduler.h @@ -26,7 +26,7 @@ #include "ns3/test.h" -using namespace ns3; +namespace ns3 { /** @@ -82,4 +82,7 @@ public: +} // namespace ns3 + + #endif /* LENA_TEST_PF_FF_MAC_SCHEDULER_H */ diff --git a/src/lte/test/lte-test-phy-error-model.cc b/src/lte/test/lte-test-phy-error-model.cc index 2fe938717..fec7d6cb6 100644 --- a/src/lte/test/lte-test-phy-error-model.cc +++ b/src/lte/test/lte-test-phy-error-model.cc @@ -30,7 +30,6 @@ #include #include #include -#include "ns3/lte-test-phy-error-model.h" #include #include #include @@ -48,10 +47,11 @@ #include #include +#include "lte-test-phy-error-model.h" NS_LOG_COMPONENT_DEFINE ("LenaTestPhyErrorModel"); -using namespace ns3; +namespace ns3 { LenaTestPhyErrorModelrSuite::LenaTestPhyErrorModelrSuite () @@ -257,3 +257,6 @@ LenaPhyErrorModelTestCase::DoRun (void) Simulator::Destroy (); } +} // namespace ns3 + + diff --git a/src/lte/test/lte-test-phy-error-model.h b/src/lte/test/lte-test-phy-error-model.h index 329ce176d..77d6582e2 100644 --- a/src/lte/test/lte-test-phy-error-model.h +++ b/src/lte/test/lte-test-phy-error-model.h @@ -25,7 +25,7 @@ #include "ns3/test.h" -using namespace ns3; +namespace ns3 { /** @@ -63,4 +63,7 @@ public: +} // namespace ns3 + + #endif /* LENA_TEST_PHY_ERROR_MODEL_H */ diff --git a/src/lte/test/lte-test-rlc-am-e2e.cc b/src/lte/test/lte-test-rlc-am-e2e.cc index 9b17590a0..bf114e0d2 100644 --- a/src/lte/test/lte-test-rlc-am-e2e.cc +++ b/src/lte/test/lte-test-rlc-am-e2e.cc @@ -25,23 +25,20 @@ #include "ns3/packet.h" #include "ns3/node-container.h" #include "ns3/net-device-container.h" -#include "ns3/lte-simple-helper.h" #include "ns3/error-model.h" - #include "ns3/radio-bearer-stats-calculator.h" - #include "ns3/lte-rlc-header.h" #include "ns3/lte-rlc-um.h" - -#include "ns3/lte-test-entities.h" -#include "ns3/lte-test-rlc-am-e2e.h" - #include "ns3/config-store.h" +#include "lte-test-rlc-am-e2e.h" +#include "lte-simple-helper.h" +#include "lte-test-entities.h" + NS_LOG_COMPONENT_DEFINE ("LteRlcAmE2eTest"); -using namespace ns3; +namespace ns3 { /** @@ -214,3 +211,6 @@ LteRlcAmE2eTestCase::DoRun (void) Simulator::Destroy (); } + +} // namespace ns3 + diff --git a/src/lte/test/lte-test-rlc-am-e2e.h b/src/lte/test/lte-test-rlc-am-e2e.h index eb4ad2f2e..e2e064085 100644 --- a/src/lte/test/lte-test-rlc-am-e2e.h +++ b/src/lte/test/lte-test-rlc-am-e2e.h @@ -24,7 +24,7 @@ #include "ns3/test.h" -using namespace ns3; +namespace ns3 { /** @@ -58,4 +58,7 @@ class LteRlcAmE2eTestCase : public TestCase }; +} // namespace ns3 + + #endif // LTE_TEST_RLC_AM_E2E_H diff --git a/src/lte/test/lte-test-rlc-am-transmitter.cc b/src/lte/test/lte-test-rlc-am-transmitter.cc index 910c33c4e..7eb714ec2 100644 --- a/src/lte/test/lte-test-rlc-am-transmitter.cc +++ b/src/lte/test/lte-test-rlc-am-transmitter.cc @@ -24,11 +24,12 @@ #include "ns3/lte-rlc-header.h" #include "ns3/lte-rlc-am.h" -#include "ns3/lte-test-rlc-am-transmitter.h" +#include "lte-test-rlc-am-transmitter.h" +#include "lte-test-entities.h" NS_LOG_COMPONENT_DEFINE ("LteRlcAmTransmitterTest"); -using namespace ns3; +namespace ns3 { /** @@ -296,3 +297,6 @@ LteRlcAmTransmitterReportBufferStatusTestCase::DoRun (void) Simulator::Run (); Simulator::Destroy (); } + +} // namespace ns3 + diff --git a/src/lte/test/lte-test-rlc-am-transmitter.h b/src/lte/test/lte-test-rlc-am-transmitter.h index 9289f62cd..1fcda8986 100644 --- a/src/lte/test/lte-test-rlc-am-transmitter.h +++ b/src/lte/test/lte-test-rlc-am-transmitter.h @@ -23,10 +23,12 @@ #include "ns3/test.h" -#include "ns3/lte-test-entities.h" -using namespace ns3; +namespace ns3 { +class LteTestRrc; +class LteTestMac; +class LteTestPdcp; /** * TestSuite 4.1.1 RLC AM: Only transmitter @@ -118,4 +120,6 @@ class LteRlcAmTransmitterReportBufferStatusTestCase : public LteRlcAmTransmitter }; +} // namespace ns3 + #endif // LTE_TEST_RLC_AM_TRANSMITTER_H diff --git a/src/lte/test/lte-test-rlc-um-e2e.cc b/src/lte/test/lte-test-rlc-um-e2e.cc index 59804162d..ed387ccbc 100644 --- a/src/lte/test/lte-test-rlc-um-e2e.cc +++ b/src/lte/test/lte-test-rlc-um-e2e.cc @@ -25,20 +25,19 @@ #include "ns3/packet.h" #include "ns3/node-container.h" #include "ns3/net-device-container.h" -#include "ns3/lte-simple-helper.h" #include "ns3/error-model.h" #include "ns3/radio-bearer-stats-calculator.h" - #include "ns3/lte-rlc-header.h" #include "ns3/lte-rlc-um.h" -#include "ns3/lte-test-entities.h" -#include "ns3/lte-test-rlc-um-e2e.h" +#include "lte-simple-helper.h" +#include "lte-test-entities.h" +#include "lte-test-rlc-um-e2e.h" NS_LOG_COMPONENT_DEFINE ("LteRlcUmE2eTest"); -using namespace ns3; +namespace ns3 { /** @@ -224,3 +223,6 @@ LteRlcUmE2eTestCase::DoRun (void) Simulator::Destroy (); } + +} // namespace ns3 + diff --git a/src/lte/test/lte-test-rlc-um-e2e.h b/src/lte/test/lte-test-rlc-um-e2e.h index 906144ba8..b2065c786 100644 --- a/src/lte/test/lte-test-rlc-um-e2e.h +++ b/src/lte/test/lte-test-rlc-um-e2e.h @@ -24,7 +24,7 @@ #include "ns3/test.h" -using namespace ns3; +namespace ns3 { /** @@ -58,4 +58,7 @@ class LteRlcUmE2eTestCase : public TestCase }; +} // namespace ns3 + + #endif // LTE_TEST_RLC_UM_E2E_H diff --git a/src/lte/test/lte-test-rlc-um-transmitter.cc b/src/lte/test/lte-test-rlc-um-transmitter.cc index 7b14470d1..406d5b9ac 100644 --- a/src/lte/test/lte-test-rlc-um-transmitter.cc +++ b/src/lte/test/lte-test-rlc-um-transmitter.cc @@ -24,11 +24,12 @@ #include "ns3/lte-rlc-header.h" #include "ns3/lte-rlc-um.h" -#include "ns3/lte-test-rlc-um-transmitter.h" +#include "lte-test-rlc-um-transmitter.h" +#include "lte-test-entities.h" NS_LOG_COMPONENT_DEFINE ("LteRlcUmTransmitterTest"); -using namespace ns3; +namespace ns3 { /** @@ -298,3 +299,6 @@ LteRlcUmTransmitterReportBufferStatusTestCase::DoRun (void) Simulator::Destroy (); } +} // namespace ns3 + + diff --git a/src/lte/test/lte-test-rlc-um-transmitter.h b/src/lte/test/lte-test-rlc-um-transmitter.h index 32589475b..b17148eab 100644 --- a/src/lte/test/lte-test-rlc-um-transmitter.h +++ b/src/lte/test/lte-test-rlc-um-transmitter.h @@ -23,10 +23,12 @@ #include "ns3/test.h" -#include "ns3/lte-test-entities.h" -using namespace ns3; +namespace ns3 { +class LteTestRrc; +class LteTestMac; +class LteTestPdcp; /** * TestSuite 4.1.1 RLC UM: Only transmitter @@ -118,4 +120,6 @@ class LteRlcUmTransmitterReportBufferStatusTestCase : public LteRlcUmTransmitter }; +} // namespace ns3 + #endif /* LTE_TEST_RLC_UM_TRANSMITTER_H */ 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 8f01655e9..b10e2808a 100644 --- a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc @@ -29,7 +29,6 @@ #include #include "ns3/radio-bearer-stats-calculator.h" #include -#include "ns3/lte-test-rr-ff-mac-scheduler.h" #include #include #include @@ -45,10 +44,11 @@ #include #include +#include "lte-test-rr-ff-mac-scheduler.h" NS_LOG_COMPONENT_DEFINE ("LenaTestRrFfMacCheduler"); -using namespace ns3; +namespace ns3 { LenaTestRrFfMacSchedulerSuite::LenaTestRrFfMacSchedulerSuite () @@ -324,3 +324,6 @@ LenaRrFfMacSchedulerTestCase::DoRun (void) Simulator::Destroy (); } + +} // namespace ns3 + diff --git a/src/lte/test/lte-test-rr-ff-mac-scheduler.h b/src/lte/test/lte-test-rr-ff-mac-scheduler.h index e91ded6ac..a1db333af 100644 --- a/src/lte/test/lte-test-rr-ff-mac-scheduler.h +++ b/src/lte/test/lte-test-rr-ff-mac-scheduler.h @@ -25,7 +25,7 @@ #include "ns3/test.h" -using namespace ns3; +namespace ns3 { /** @@ -64,5 +64,8 @@ public: +} // namespace ns3 + + #endif /* LENA_TEST_RR_FF_MAC_SCHEDULER_H */ diff --git a/src/lte/test/lte-test-ue-phy.cc b/src/lte/test/lte-test-ue-phy.cc index 5009e28c0..201869173 100644 --- a/src/lte/test/lte-test-ue-phy.cc +++ b/src/lte/test/lte-test-ue-phy.cc @@ -19,7 +19,7 @@ */ #include "ns3/log.h" -#include "ns3/lte-test-ue-phy.h" +#include "lte-test-ue-phy.h" NS_LOG_COMPONENT_DEFINE ("LteTestUePhy"); diff --git a/src/lte/test/lte-test-uplink-sinr.cc b/src/lte/test/lte-test-uplink-sinr.cc index 11280f5b3..1ebe4f369 100644 --- a/src/lte/test/lte-test-uplink-sinr.cc +++ b/src/lte/test/lte-test-uplink-sinr.cc @@ -25,15 +25,15 @@ #include "ns3/spectrum-test.h" #include "ns3/lte-phy-tag.h" -#include "ns3/lte-test-ue-phy.h" #include "ns3/lte-sinr-chunk-processor.h" #include "ns3/lte-spectrum-signal-parameters.h" -#include "ns3/lte-test-uplink-sinr.h" +#include "lte-test-ue-phy.h" +#include "lte-test-uplink-sinr.h" NS_LOG_COMPONENT_DEFINE ("LteUplinkSinrTest"); -using namespace ns3; +namespace ns3 { /** @@ -307,3 +307,6 @@ LteUplinkSinrTestCase::DoRun (void) Simulator::Destroy (); } + +} // namespace ns3 + diff --git a/src/lte/test/lte-test-uplink-sinr.h b/src/lte/test/lte-test-uplink-sinr.h index a8c033902..1ea11bf0f 100644 --- a/src/lte/test/lte-test-uplink-sinr.h +++ b/src/lte/test/lte-test-uplink-sinr.h @@ -26,7 +26,7 @@ #include "ns3/test.h" -using namespace ns3; +namespace ns3 { /** @@ -56,3 +56,6 @@ private: #endif /* LTE_TEST_UPLINK_SINR_H */ + +} // namespace ns3 + diff --git a/src/lte/test/test-lte-antenna.cc b/src/lte/test/test-lte-antenna.cc index c16d4415d..d345c99c2 100644 --- a/src/lte/test/test-lte-antenna.cc +++ b/src/lte/test/test-lte-antenna.cc @@ -36,7 +36,7 @@ NS_LOG_COMPONENT_DEFINE ("LteAntennaTest"); -using namespace ns3; +namespace ns3 { @@ -221,3 +221,7 @@ LteAntennaTestSuite::LteAntennaTestSuite () } static LteAntennaTestSuite lteAntennaTestSuite; + + +} // namespace ns3 + diff --git a/src/lte/wscript b/src/lte/wscript index dec2ec974..1cdc6bb19 100644 --- a/src/lte/wscript +++ b/src/lte/wscript @@ -157,28 +157,9 @@ def build(bld): 'model/epc-gtpu-header.h', 'model/epc-enb-application.h', 'model/epc-sgw-pgw-application.h', - 'test/lte-test-downlink-sinr.h', - 'test/lte-test-uplink-sinr.h', - 'test/lte-test-link-adaptation.h', - 'test/lte-test-interference.h', - 'test/lte-test-sinr-chunk-processor.h', - 'test/lte-test-ue-phy.h', - 'test/lte-test-rr-ff-mac-scheduler.h', - 'test/lte-test-pf-ff-mac-scheduler.h', - 'test/lte-test-phy-error-model.h', - 'test/lte-test-pathloss-model.h', - 'test/epc-test-gtpu.h', - 'test/lte-test-entities.h', - 'test/lte-simple-net-device.h', - 'test/lte-simple-helper.h', - 'test/lte-test-rlc-um-transmitter.h', - 'test/lte-test-rlc-am-transmitter.h', - 'test/lte-test-rlc-um-e2e.h', - 'test/lte-test-rlc-am-e2e.h', 'model/epc-tft.h', 'model/epc-tft-classifier.h', 'model/lte-mi-error-model.h', - 'test/lte-test-mimo.h' ] if (bld.env['ENABLE_EXAMPLES']):