View | Details | Raw Unified | Return to bug 1192
Collapse All | Expand All

(-)a/src/mobility/test/ns2-mobility-helper-test-suite.cc (-4 / +13 lines)
 Lines 201-206    Link Here 
201
    NS_TEST_EXPECT_MSG_EQ (pos, ref.pos, "Position mismatch at time " << time.GetSeconds () << " s for node " << id);
201
    NS_TEST_EXPECT_MSG_EQ (pos, ref.pos, "Position mismatch at time " << time.GetSeconds () << " s for node " << id);
202
    NS_TEST_EXPECT_MSG_EQ (vel, ref.vel, "Velocity mismatch at time " << time.GetSeconds () << " s for node " << id);
202
    NS_TEST_EXPECT_MSG_EQ (vel, ref.vel, "Velocity mismatch at time " << time.GetSeconds () << " s for node " << id);
203
  }
203
  }
204
  
205
  void DoSetup ()
206
  {
207
    CreateNodes ();
208
  }
209
  
210
  void DoTeardown ()
211
  {
212
    Names::Clear ();
213
    std::remove (m_traceFile.c_str ());
214
    Simulator::Destroy ();
215
  }
216
  
204
  /// Go
217
  /// Go
205
  void DoRun ()
218
  void DoRun ()
206
  {
219
  {
 Lines 211-217    Link Here 
211
      {
224
      {
212
        return;
225
        return;
213
      }
226
      }
214
    CreateNodes ();
215
    Ns2MobilityHelper mobility (m_traceFile);
227
    Ns2MobilityHelper mobility (m_traceFile);
216
    mobility.Install ();
228
    mobility.Install ();
217
    if (CheckInitialPositions ())
229
    if (CheckInitialPositions ())
 Lines 222-230    Link Here 
222
                     MakeCallback (&Ns2MobilityHelperTest::CourseChange, this));
234
                     MakeCallback (&Ns2MobilityHelperTest::CourseChange, this));
223
    Simulator::Stop (m_timeLimit);
235
    Simulator::Stop (m_timeLimit);
224
    Simulator::Run ();
236
    Simulator::Run ();
225
    Names::Clear ();
226
    std::remove (m_traceFile.c_str ());
227
    Simulator::Destroy ();
228
  }
237
  }
229
};
238
};
230
239
(-)a/src/mobility/test/steady-state-random-waypoint-mobility-model-test.cc (+7 lines)
 Lines 39-48    Link Here 
39
  double count;
39
  double count;
40
private:
40
private:
41
  virtual void DoRun (void);
41
  virtual void DoRun (void);
42
  virtual void DoTeardown (void);
42
  void DistribCompare ();
43
  void DistribCompare ();
43
};
44
};
44
45
45
void
46
void
47
SteadyStateRandomWaypointTest::DoTeardown (void)
48
{
49
  mobilityStack.clear();
50
}
51
52
void
46
SteadyStateRandomWaypointTest::DoRun (void)
53
SteadyStateRandomWaypointTest::DoRun (void)
47
{
54
{
48
  SeedManager::SetSeed (123);
55
  SeedManager::SetSeed (123);
(-)a/src/mobility/test/waypoint-mobility-model-test.cc (+9 lines)
 Lines 47-55    Link Here 
47
  bool lazyNotify;
47
  bool lazyNotify;
48
private:
48
private:
49
  virtual void DoRun (void);
49
  virtual void DoRun (void);
50
  virtual void DoTeardown (void);
50
  void ForceUpdates (void);
51
  void ForceUpdates (void);
51
  void CourseChangeCallback (std::string path, Ptr<const MobilityModel> model);
52
  void CourseChangeCallback (std::string path, Ptr<const MobilityModel> model);
52
};
53
};
54
55
void
56
WaypointMobilityModelNotifyTest::DoTeardown (void)
57
{
58
  mobilityStack.clear();
59
  waypoints.clear();
60
}
61
53
void
62
void
54
WaypointMobilityModelNotifyTest::DoRun (void)
63
WaypointMobilityModelNotifyTest::DoRun (void)
55
{
64
{

Return to bug 1192