Mercurial Mercurial > ns-3.24 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update mesh tests to account for wifi random variables
authorTom Henderson <tomh@tomh.org>
Thu, 11 Sep 2014 14:06:19 -0700
changeset 10922 2674fb224fe9
parent 10921 f96c9e2b49c0
child 10923 9fa8f65c6b97
update mesh tests to account for wifi random variables
src/mesh/test/dot11s/hwmp-proactive-regression.cc file | annotate | diff | comparison | revisions
src/mesh/test/dot11s/hwmp-reactive-regression.cc file | annotate | diff | comparison | revisions
src/mesh/test/dot11s/hwmp-simplest-regression.cc file | annotate | diff | comparison | revisions
src/mesh/test/dot11s/hwmp-target-flags-regression.cc file | annotate | diff | comparison | revisions
src/mesh/test/dot11s/pmp-regression.cc file | annotate | diff | comparison | revisions 
--- a/src/mesh/test/dot11s/hwmp-proactive-regression.cc	Thu Sep 11 13:45:38 2014 -0700
+++ b/src/mesh/test/dot11s/hwmp-proactive-regression.cc	Thu Sep 11 14:06:19 2014 -0700
@@ -118,12 +118,12 @@
   mesh.SetMacType ("RandomStart", TimeValue (Seconds (0.1)));
   mesh.SetNumberOfInterfaces (1);
   NetDeviceContainer meshDevices = mesh.Install (wifiPhy, *m_nodes);
-  // Five devices, 4 streams per device 
+  // Five devices, 9 streams per device 
   streamsUsed += mesh.AssignStreams (meshDevices, streamsUsed);
-  NS_TEST_ASSERT_MSG_EQ (streamsUsed, (meshDevices.GetN () * 4), "Stream mismatch");
+  NS_TEST_ASSERT_MSG_EQ (streamsUsed, (meshDevices.GetN () * 9), "Stream mismatch");
   // No streams used here, by default
   streamsUsed += wifiChannel.AssignStreams (chan, streamsUsed);
-  NS_TEST_ASSERT_MSG_EQ (streamsUsed, (meshDevices.GetN () * 4), "Stream mismatch");
+  NS_TEST_ASSERT_MSG_EQ (streamsUsed, (meshDevices.GetN () * 9), "Stream mismatch");
 
   // 3. setup TCP/IP
   InternetStackHelper internetStack;
--- a/src/mesh/test/dot11s/hwmp-reactive-regression.cc	Thu Sep 11 13:45:38 2014 -0700
+++ b/src/mesh/test/dot11s/hwmp-reactive-regression.cc	Thu Sep 11 14:06:19 2014 -0700
@@ -118,9 +118,9 @@
   NetDeviceContainer meshDevices = mesh.Install (wifiPhy, *m_nodes);
   // Six devices, 4 streams per device
   streamsUsed += mesh.AssignStreams (meshDevices, streamsUsed);
-  NS_TEST_EXPECT_MSG_EQ (streamsUsed, (meshDevices.GetN () * 4), "Stream assignment mismatch");
+  NS_TEST_EXPECT_MSG_EQ (streamsUsed, (meshDevices.GetN () * 9), "Stream assignment mismatch");
   streamsUsed += wifiChannel.AssignStreams (chan, streamsUsed);
-  NS_TEST_EXPECT_MSG_EQ (streamsUsed, (meshDevices.GetN () * 4), "Stream assignment mismatch");
+  NS_TEST_EXPECT_MSG_EQ (streamsUsed, (meshDevices.GetN () * 9), "Stream assignment mismatch");
 
   // 3. setup TCP/IP
   InternetStackHelper internetStack;
--- a/src/mesh/test/dot11s/hwmp-simplest-regression.cc	Thu Sep 11 13:45:38 2014 -0700
+++ b/src/mesh/test/dot11s/hwmp-simplest-regression.cc	Thu Sep 11 14:06:19 2014 -0700
@@ -127,11 +127,11 @@
   mesh.SetMacType ("RandomStart", TimeValue (Seconds (0.1)));
   mesh.SetNumberOfInterfaces (1);
   NetDeviceContainer meshDevices = mesh.Install (wifiPhy, *m_nodes);
-  // Two devices, four streams per mesh device
+  // Two devices, nine streams per mesh device
   streamsUsed += mesh.AssignStreams (meshDevices, streamsUsed);
-  NS_TEST_ASSERT_MSG_EQ (streamsUsed, (meshDevices.GetN () * 4), "Stream assignment mismatch");
+  NS_TEST_ASSERT_MSG_EQ (streamsUsed, (meshDevices.GetN () * 9), "Stream assignment mismatch");
   streamsUsed += wifiChannel.AssignStreams (chan, streamsUsed);
-  NS_TEST_ASSERT_MSG_EQ (streamsUsed, (meshDevices.GetN () * 4), "Stream assignment mismatch");
+  NS_TEST_ASSERT_MSG_EQ (streamsUsed, (meshDevices.GetN () * 9), "Stream assignment mismatch");
 
   // 3. setup TCP/IP
   InternetStackHelper internetStack;
--- a/src/mesh/test/dot11s/hwmp-target-flags-regression.cc	Thu Sep 11 13:45:38 2014 -0700
+++ b/src/mesh/test/dot11s/hwmp-target-flags-regression.cc	Thu Sep 11 14:06:19 2014 -0700
@@ -134,11 +134,11 @@
   mesh.SetMacType ("RandomStart", TimeValue (Seconds (0.1)));
   mesh.SetNumberOfInterfaces (1);
   NetDeviceContainer meshDevices = mesh.Install (wifiPhy, *m_nodes);
-  // Four devices, four streams per mac
+  // Four devices, nine streams per mac
   streamsUsed += mesh.AssignStreams (meshDevices, streamsUsed);
-  NS_TEST_ASSERT_MSG_EQ (streamsUsed, (meshDevices.GetN () * 4), "Stream assignment mismatch");
+  NS_TEST_ASSERT_MSG_EQ (streamsUsed, (meshDevices.GetN () * 9), "Stream assignment mismatch");
   streamsUsed += wifiChannel.AssignStreams (chan, streamsUsed);
-  NS_TEST_ASSERT_MSG_EQ (streamsUsed, (meshDevices.GetN () * 4), "Stream assignment mismatch");
+  NS_TEST_ASSERT_MSG_EQ (streamsUsed, (meshDevices.GetN () * 9), "Stream assignment mismatch");
 
   // 3. setup TCP/IP
   InternetStackHelper internetStack;
--- a/src/mesh/test/dot11s/pmp-regression.cc	Thu Sep 11 13:45:38 2014 -0700
+++ b/src/mesh/test/dot11s/pmp-regression.cc	Thu Sep 11 14:06:19 2014 -0700
@@ -99,11 +99,11 @@
   mesh.SetMacType ("RandomStart", TimeValue (Seconds (0.1)));
   mesh.SetNumberOfInterfaces (1);
   NetDeviceContainer meshDevices = mesh.Install (wifiPhy, *m_nodes);
-  // Two devices, four streams per device (one for mac, one for phy, 
-  // two for plugins)
+  // Two devices, nine streams per device (one for mac, one for phy, 
+  // two for plugins, five for regular mac wifi DCF)
   streamsUsed += mesh.AssignStreams (meshDevices, 0);
-  NS_TEST_ASSERT_MSG_EQ (streamsUsed, (meshDevices.GetN () * 4), "Stream assignment mismatch");
-  wifiChannel.AssignStreams (chan, streamsUsed);
+  NS_TEST_ASSERT_MSG_EQ (streamsUsed, (meshDevices.GetN () * 9), "Stream assignment mismatch");
+  streamsUsed += wifiChannel.AssignStreams (chan, streamsUsed);
   // 3. write PCAP if needed
   wifiPhy.EnablePcapAll (CreateTempDirFilename (PREFIX));
 }
ns-3.24