commit 27acad99175a608ffe467c9eb9d527bdb024affe
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jul 20 15:32:20 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jul 20 15:32:20 2012 -0700
tree ab285d4c81bd1b305fffe86dafb6cdf6eae57a3f
parent 8bedcaf974287b01de1e00f9d7fa335bec8106c5

Small change with LoadStats unit tests

test/ndnSIM-stats-tree.cc

diff --git a/test/ndnSIM-stats-tree.cc b/test/ndnSIM-stats-tree.cc
index 377f09f..58b9c4b 100644
--- a/test/ndnSIM-stats-tree.cc
+++ b/test/ndnSIM-stats-tree.cc
@@ -20,6 +20,7 @@
 
 #include "ndnSIM-stats-tree.h"
 #include "ns3/core-module.h"
+#include "ns3/point-to-point-module.h"
 #include "ns3/ndnSIM-module.h"
 #include "../utils/stats-tree.h"
 #include "../apps/ccnx-producer.h"
@@ -36,6 +37,14 @@
 void
 StatsTreeTest::DoRun ()
 {
+  BasicTests ();
+  SimpleScenario ();
+}
+
+
+void
+StatsTreeTest::BasicTests ()
+{
   CcnxStackHelper ccnx;
 
   Ptr<Node> node1   = CreateObject<Node> ();
@@ -181,7 +190,7 @@
   NS_TEST_ASSERT_MSG_NE (&tree ["/bla/bla/bla"],
                          &tree ["/"],
                          "The stats tree should not be empty");
-  for (uint32_t i = 0; i < 50; i++)
+  for (uint32_t i = 0; i < 9; i++)
     {
       tree.Step ();
     }
@@ -192,4 +201,18 @@
                          "The stats tree should be empty (only root node)");
 }
 
+
+
+void
+StatsTreeTest::SimpleScenario ()
+{
+  NodeContainer nodes;
+  nodes.Create (2);
+  PointToPointHelper p2pHelper;
+  p2pHelper.Install (nodes);
+
+
+  
+}
+
 }

test/ndnSIM-stats-tree.h

diff --git a/test/ndnSIM-stats-tree.h b/test/ndnSIM-stats-tree.h
index 504257c..a98a79f 100644
--- a/test/ndnSIM-stats-tree.h
+++ b/test/ndnSIM-stats-tree.h
@@ -37,6 +37,12 @@
     
 private:
   virtual void DoRun ();
+
+  void
+  BasicTests ();
+
+  void
+  SimpleScenario ();
 };
   
 }

utils/load-stats-face.cc

diff --git a/utils/load-stats-face.cc b/utils/load-stats-face.cc
index 09f3d05..56701e4 100644
--- a/utils/load-stats-face.cc
+++ b/utils/load-stats-face.cc
@@ -71,7 +71,7 @@
   for_each< range_c<int, 0, length<LoadStats::stats_tuple>::value> >
     (update_retval (m_count, m_satisfied, retval));
 
-  NS_LOG_DEBUG (retval.get<0> () << ", " << retval.get<1> () << ", " << retval.get<2> ());
+  // NS_LOG_DEBUG (retval.get<0> () << ", " << retval.get<1> () << ", " << retval.get<2> ());
   return retval;
 }
 
@@ -82,7 +82,7 @@
   for_each< range_c<int, 0, length<LoadStats::stats_tuple>::value> >
     (update_retval (m_count, m_unsatisfied, retval));
 
-  NS_LOG_DEBUG (retval.get<0> () << ", " << retval.get<1> () << ", " << retval.get<2> ());
+  // NS_LOG_DEBUG (retval.get<0> () << ", " << retval.get<1> () << ", " << retval.get<2> ());
   return retval;
 }