From e6a18d3322ee3134478fce9cf91dfaafb2d99a44 Mon Sep 17 00:00:00 2001
From: Tim Schubert <tim.schubert@tu-bs.de>
Date: Sun, 23 Aug 2020 12:50:36 +0200
Subject: [PATCH] fixup: tests

---
 test/isl-mock-channel-test-suite.cc |  6 ------
 test/leo-propagation-test-suite.cc  | 13 +++++++------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/test/isl-mock-channel-test-suite.cc b/test/isl-mock-channel-test-suite.cc
index 21b2ba6..3fb3ba2 100644
--- a/test/isl-mock-channel-test-suite.cc
+++ b/test/isl-mock-channel-test-suite.cc
@@ -69,23 +69,17 @@ void
 IslMockChannelTransmitKnownTestCase::DoRun (void)
 {
   Ptr<IslMockChannel> channel = CreateObject<IslMockChannel> ();
-  channel->SetAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel"));
-  channel->SetAttribute ("PropagationLoss", StringValue ("ns3::IslPropagationLossModel"));
 
   Packet *packet = new Packet ();
   Ptr<Packet> p = Ptr<Packet>(packet);
 
   Ptr<Node> srcNode = CreateObject<Node> ();
-  Ptr<ConstantPositionMobilityModel> loc = CreateObject<ConstantPositionMobilityModel> ();
-  srcNode->AggregateObject (loc);
   Ptr<MockNetDevice> srcDev = CreateObject<MockNetDevice> ();
   srcDev->SetNode (srcNode);
   srcDev->SetAddress (Mac48Address::Allocate ());
   int32_t srcId = channel->Attach (srcDev);
 
   Ptr<Node> dstNode = CreateObject<Node> ();
-  loc = CreateObject<ConstantPositionMobilityModel> ();
-  dstNode->AggregateObject (loc);
   Ptr<MockNetDevice> dstDev = CreateObject<MockNetDevice> ();
   dstDev->SetNode (dstNode);
   dstDev->SetAddress (Mac48Address::Allocate ());
diff --git a/test/leo-propagation-test-suite.cc b/test/leo-propagation-test-suite.cc
index 6db1985..ef19298 100644
--- a/test/leo-propagation-test-suite.cc
+++ b/test/leo-propagation-test-suite.cc
@@ -121,14 +121,15 @@ void
 LeoPropagationRxNoLosTestCase::DoRun ()
 {
   Ptr<ConstantPositionMobilityModel> a = CreateObject<ConstantPositionMobilityModel> ();
-  a->SetPosition (Vector3D (1000000.0, 0, 0));
+  a->SetPosition (Vector3D (6.7e6, 0, 0));
   Ptr<ConstantPositionMobilityModel> b = CreateObject<ConstantPositionMobilityModel> ();
-  b->SetPosition (Vector3D (-1000000.0, 0, 0));
+  b->SetPosition (Vector3D (-7.0e6, 0, 0));
 
   Ptr<LeoPropagationLossModel> model = CreateObject<LeoPropagationLossModel> ();
-  model->SetAttribute ("MaxDistance", DoubleValue (1000000.0));
+  model->SetAttribute ("MaxDistance", DoubleValue (6000)); // km
+  model->SetAttribute ("ElevationAngle", DoubleValue (10.0));
 
-  NS_TEST_ASSERT_MSG_EQ (model->CalcRxPower (1.0, a, b), 0.0, "0 Rx power without LOS");
+  NS_TEST_ASSERT_MSG_LT (model->CalcRxPower (1.0, a, b), -500.0, "0 Rx power without LOS");
 }
 
 class LeoPropagationRxLosTestCase : public TestCase
@@ -183,9 +184,9 @@ LeoPropagationBadAngleTestCase::DoRun ()
   b->SetPosition (Vector3D (1000000.0, sin (M_PI / 9) * 1000000.0, 0));
 
   Ptr<LeoPropagationLossModel> model = CreateObject<LeoPropagationLossModel> ();
-  model->SetAttribute ("ElevationAngle", DoubleValue (M_PI / 9));
+  model->SetAttribute ("ElevationAngle", DoubleValue (90));
 
-  NS_TEST_ASSERT_MSG_EQ (model->CalcRxPower (1.0, a, b), 0.0, "Tx must be 0 if elevation is too large");
+  NS_TEST_ASSERT_MSG_LT (model->CalcRxPower (1.0, a, b), -500.0, "Tx must be 0 if elevation is too large");
 }
 
 class LeoPropagationLossTestCase : public TestCase