commit 4aac5571b86f90ef8a96cf0a001b05e59a94b876
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Aug 09 10:49:55 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Aug 09 15:01:41 2012 -0700
tree e15d652bf5113be28cc273833069eed899163423
parent 1f288e30883993e040e42b7e56930143b057203f

First step of refactoring code (ccnx prefix => ndn prefix)

test/ndnSIM-serialization.cc

diff --git a/test/ndnSIM-serialization.cc b/test/ndnSIM-serialization.cc
index 6c3d722..244aae8 100644
--- a/test/ndnSIM-serialization.cc
+++ b/test/ndnSIM-serialization.cc
@@ -34,9 +34,9 @@
 void
 InterestSerializationTest::DoRun ()
 {
-  CcnxInterestHeader source;
-  source.SetName                (Create<CcnxNameComponents> (boost::lexical_cast<CcnxNameComponents> ("/test/test2")));
-  NS_TEST_ASSERT_MSG_EQ (source.GetName (), boost::lexical_cast<CcnxNameComponents> ("/test/test2"), "set/get name failed");
+  NdnInterestHeader source;
+  source.SetName                (Create<NdnNameComponents> (boost::lexical_cast<NdnNameComponents> ("/test/test2")));
+  NS_TEST_ASSERT_MSG_EQ (source.GetName (), boost::lexical_cast<NdnNameComponents> ("/test/test2"), "set/get name failed");
   
   source.SetMinSuffixComponents (20);
   NS_TEST_ASSERT_MSG_EQ (source.GetMinSuffixComponents (), 20, "set/get minSuffixComponents failed");
@@ -44,8 +44,8 @@
   source.SetMaxSuffixComponents (40);
   NS_TEST_ASSERT_MSG_EQ (source.GetMaxSuffixComponents (), 40, "set/get maxSuffixComponents failed");
 
-  source.SetExclude (Create<CcnxNameComponents> (boost::lexical_cast<CcnxNameComponents> ("/exclude/exclude2")));
-  NS_TEST_ASSERT_MSG_EQ (source.GetExclude (), boost::lexical_cast<CcnxNameComponents> ("/exclude/exclude2"), "set/get exclude failed");
+  source.SetExclude (Create<NdnNameComponents> (boost::lexical_cast<NdnNameComponents> ("/exclude/exclude2")));
+  NS_TEST_ASSERT_MSG_EQ (source.GetExclude (), boost::lexical_cast<NdnNameComponents> ("/exclude/exclude2"), "set/get exclude failed");
 
   source.SetChildSelector       (false);
   NS_TEST_ASSERT_MSG_EQ (source.IsEnabledChildSelector (), false, "set/get child selector failed");
@@ -74,7 +74,7 @@
   packet.AddHeader (source);
 	
   //deserialization
-  CcnxInterestHeader target;
+  NdnInterestHeader target;
   packet.RemoveHeader (target);
   
   NS_TEST_ASSERT_MSG_EQ (source.GetName ()                  , target.GetName ()                 , "source/target name failed");