From 9fcf2037b000d978a1569ad275b3c4fa24c6ca96 Mon Sep 17 00:00:00 2001
From: Nicola Baldo <nbaldo@cttc.es>
Date: Tue, 14 Apr 2015 16:02:03 +0200
Subject: [PATCH] fixed some RLC tests that were crashing

---
 src/lte/test/lte-test-entities.cc           | 40 +++++++++++++++++++--
 src/lte/test/lte-test-rlc-am-transmitter.cc |  4 +++
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/lte/test/lte-test-entities.cc b/src/lte/test/lte-test-entities.cc
index ef079f28e..8aebfaf5c 100644
--- a/src/lte/test/lte-test-entities.cc
+++ b/src/lte/test/lte-test-entities.cc
@@ -204,8 +204,26 @@ LteTestRrc::Start ()
   p.rnti = 1111;
   p.lcid = 222;
   p.pdcpSdu = Create<Packet> (m_pduSize);
+  
+  bool haveContext = false;
+  Ptr<Node> node;
+  if (m_device != 0)
+    {
+      node = m_device->GetNode ();
+      if (node != 0)
+        {                    
+          haveContext = true;
+        }
+    }
+  if (haveContext)
+    {
+      Simulator::ScheduleWithContext (node->GetId (), Seconds (0), &LtePdcpSapProvider::TransmitPdcpSdu, m_pdcpSapProvider, p);
+    }
+  else
+    {
+      Simulator::Schedule (Seconds (0), &LtePdcpSapProvider::TransmitPdcpSdu, m_pdcpSapProvider, p);
+    }
 
-  Simulator::ScheduleWithContext (m_device->GetNode ()->GetId (), Seconds (0), &LtePdcpSapProvider::TransmitPdcpSdu, m_pdcpSapProvider, p);
   m_nextPdu = Simulator::Schedule (m_arrivalTime, &LteTestRrc::Start, this);
 //   Simulator::Run ();
 }
@@ -457,7 +475,25 @@ void
 LteTestMac::SendTxOpportunity (Time time, uint32_t bytes)
 {
   NS_LOG_FUNCTION (this << time << bytes);
-  Simulator::ScheduleWithContext (m_device->GetNode ()->GetId (), time, &LteMacSapUser::NotifyTxOpportunity, m_macSapUser, bytes, 0, 0);
+  bool haveContext = false;
+  Ptr<Node> node;
+  if (m_device != 0)
+    {
+      node = m_device->GetNode ();
+      if (node != 0)
+        {                    
+          haveContext = true;
+        }
+    }
+  if (haveContext)
+    {
+      Simulator::ScheduleWithContext (node->GetId (), time, &LteMacSapUser::NotifyTxOpportunity, m_macSapUser, bytes, 0, 0);
+    }
+  else
+    {
+      Simulator::Schedule (time, &LteMacSapUser::NotifyTxOpportunity, m_macSapUser, bytes, 0, 0);
+    }
+    
   if (m_txOpportunityMode == RANDOM_MODE)
   {
     if (m_txOppTime != Seconds (0))
diff --git a/src/lte/test/lte-test-rlc-am-transmitter.cc b/src/lte/test/lte-test-rlc-am-transmitter.cc
index cdb5f7534..f7b8a93e7 100644
--- a/src/lte/test/lte-test-rlc-am-transmitter.cc
+++ b/src/lte/test/lte-test-rlc-am-transmitter.cc
@@ -140,6 +140,7 @@ LteRlcAmTransmitterOneSduTestCase::DoRun (void)
   txMac->SendTxOpportunity (Seconds (0.150), 30);
   CheckDataReceived (Seconds (0.200), "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "SDU is not OK");
 
+  Simulator::Stop (Seconds (0.3));
   Simulator::Run ();
   Simulator::Destroy ();
 }
@@ -182,6 +183,7 @@ LteRlcAmTransmitterSegmentationTestCase::DoRun (void)
   txMac->SendTxOpportunity (Seconds (0.450), 7);
   CheckDataReceived (Seconds (0.500), "YZZ", "Segment #4 is not OK");
 
+  Simulator::Stop (Seconds (0.6));
   Simulator::Run ();
   Simulator::Destroy ();
 }
@@ -218,6 +220,7 @@ LteRlcAmTransmitterConcatenationTestCase::DoRun (void)
   txMac->SendTxOpportunity (Seconds (0.250), 33);
   CheckDataReceived (Seconds (0.300), "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "Concatenation is not OK");
 
+  Simulator::Stop (Seconds (0.4));
   Simulator::Run ();
   Simulator::Destroy ();
 }
@@ -294,6 +297,7 @@ LteRlcAmTransmitterReportBufferStatusTestCase::DoRun (void)
   txMac->SendTxOpportunity (Seconds (1.650), (4+2+1+2) + (3+10+10+7));
   CheckDataReceived (Seconds (1.700), "XYZABCDEFGHIJKLMNOPQRSTUVWXYZ", "SDU #9 is not OK");
 
+  Simulator::Stop (Seconds (2));
   Simulator::Run ();
   Simulator::Destroy ();
 }