merge

src/lte/test/lena-test-suite.cc

@@ -26,81 +26,6 @@
 using namespace ns3;
 
 
-// class LenaTestCase : public TestCase
-// {
-//   public:
-//     LenaTestCase ();
-//     virtual ~LenaTestCase ();
-// 
-//   private:
-//     virtual void DoRun (void);
-// };
-// 
-// LenaTestCase::LenaTestCase ()
-//   : TestCase ("Test identical (with tolerance) throughput of two UEs the same SINR")
-// {
-// }
-// 
-// LenaTestCase::~LenaTestCase ()
-// {
-// }
-// 
-// 
-// void
-// LenaTestCase::DoRun (void)
-// {
-// //   LenaHelper lena;
-// //   lena.EnableLogComponents ();
-// // 
-// //   // Create Nodes: eNodeB and UE
-// //   NodeContainer enbNodes;
-// //   NodeContainer ueNodes;
-// //   enbNodes.Create (1);
-// //   ueNodes.Create (1);
-// // 
-// //   // Install Mobility Model
-// //   MobilityHelper mobility;
-// //   mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
-// //   mobility.Install (enbNodes);
-// // //  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
-// //   mobility.Install (ueNodes);
-// // 
-// //   // Create Devices and install them in the Nodes (eNB and UE)
-// //   NetDeviceContainer enbDevs;
-// //   NetDeviceContainer ueDevs;
-// //   enbDevs = lena.InstallEnbDevice (enbNodes);
-// //   ueDevs = lena.InstallUeDevice (ueNodes);
-// // 
-// //   // Attach a UE to a eNB
-// //   lena.Attach (ueDevs, enbDevs.Get (0));
-// // 
-// //   // Activate an EPS bearer
-// //   enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE;
-// //   EpsBearer bearer (q);
-// //   lena.ActivateEpsBearer (ueDevs, bearer);
-// // 
-// //   Simulator::Stop (Seconds (0.01));
-// // 
-// //   Simulator::Run ();
-// //   Simulator::Destroy ();
-// 
-//   // Calculate throughput = total number of bytes received / simulation time
-// 
-//   /*
-//    * If ( throughput_ref - tolerance < throughput < throughput_ref + tolerance ) then
-//    *    Test OK
-//    * else
-//    *    Test KO
-//    */
-// 
-// // MRE: Now how the status is returned???
-// 
-// //  // Return false if an error has _not_ occurred
-// //  return false;
-// }
-// 
-
-
 class LenaTestSuite : public TestSuite
 {
 public:
@@ -111,7 +36,6 @@ LenaTestSuite::LenaTestSuite ()
   : TestSuite ("lena", SYSTEM)
 {
   AddTestCase (new LenaDownlinkSinrTestCase);
-//   AddTestCase (new LenaTestCase);
 }
 
 static LenaTestSuite lenaTestSuite;