commit b6cf56efc8926aa7edfd42ca27421003804bf19f
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue May 29 19:33:49 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue May 29 19:33:49 2012 -0700
tree 8fd8e54b4ba8e13d144877d2afb147e5877d9d6f
parent f007f926270d900f90f748515a44c5578e17a329
parent a76010b45e9a560d1ee0bb2cadc42ba2cee6c492

Merge with branch 'simulation'

model/sync-logic.cc

diff --git a/model/sync-logic.cc b/model/sync-logic.cc
index 6bd7c42..3bae752 100644
--- a/model/sync-logic.cc
+++ b/model/sync-logic.cc
@@ -20,8 +20,10 @@
  *	   Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
+#ifdef NS3_MODULE
 #include <ns3/ccnx-pit.h>
 #include <ns3/ccnx.h>
+#endif
 
 #include "sync-logic.h"
 #include "sync-diff-leaf.h"

model/sync-logic.h

diff --git a/model/sync-logic.h b/model/sync-logic.h
index 13ae9b7..e205fc0 100644
--- a/model/sync-logic.h
+++ b/model/sync-logic.h
@@ -191,12 +191,6 @@
       REEXPRESSING_INTEREST = 2,
       REEXPRESSING_RECOVERY_INTEREST = 3
     };
-
-#ifdef _DEBUG
-#ifdef HAVE_LOG4CXX
-  log4cxx::LoggerPtr staticModuleLogger;
-#endif
-#endif  
 };
 
 

test/test_digest.cc

diff --git a/test/test_digest.cc b/test/test_digest.cc
index 8afd88b..3cb124e 100644
--- a/test/test_digest.cc
+++ b/test/test_digest.cc
@@ -61,8 +61,10 @@
   
   output_test_stream output;
   BOOST_CHECK_NO_THROW (output << d1);
-  BOOST_CHECK (output.check_length (40,false) );
-  BOOST_CHECK (output.is_equal ("e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e", true));
+  // BOOST_CHECK (output.check_length (40, false) );
+  // BOOST_CHECK (output.is_equal ("e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e", true)); // for sha1
+	BOOST_CHECK (output.check_length (64, false) );
+	BOOST_CHECK (output.is_equal ("4355a46b19d348dc2f57c046f8ef63d4538ebb936000f3c9ee954a27460dd865", true)); // for sha256
 }
 
 BOOST_AUTO_TEST_CASE (DigestComparison)
@@ -79,7 +81,8 @@
   BOOST_CHECK (d1 != d2);
   
   Digest d3;
-  istringstream is (string ("e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e")); //real sha-1 for "1\n"
+  // istringstream is (string ("e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e")); // real sha-1 for "1\n"
+	istringstream is (string ("4355a46b19d348dc2f57c046f8ef63d4538ebb936000f3c9ee954a27460dd865")); // real sha256 for "1\n"
   BOOST_CHECK_NO_THROW (is >> d3);
   BOOST_CHECK (!d3.empty ());
   BOOST_CHECK (d3 == d1);

test/test_leaf.cc

diff --git a/test/test_leaf.cc b/test/test_leaf.cc
index 361793a..49afcc5 100644
--- a/test/test_leaf.cc
+++ b/test/test_leaf.cc
@@ -95,12 +95,14 @@
 
   output_test_stream output;
   output << fullLeaf.getDigest ();
-  BOOST_CHECK (output.is_equal ("991f8cf6262dfe0f519c63f6e9b92fe69e741a9b", true));
+  // BOOST_CHECK (output.is_equal ("991f8cf6262dfe0f519c63f6e9b92fe69e741a9b", true)); // for sha1
+	BOOST_CHECK (output.is_equal ("526d63e6e1f05f97502fd500a1729c4907f3841483ae4561b7e6307c40188f35", true)); // for sha256
 
   fullLeaf.setSeq (SeqNo (13));
   output << fullLeaf.getDigest ();
   BOOST_CHECK (!output.is_equal ("991f8cf6262dfe0f519c63f6e9b92fe69e741a9b", false));
-  BOOST_CHECK (output.is_equal ("585a8687ab41d5c29f86e5906c8f188ddca816b3", true));
+  // BOOST_CHECK (output.is_equal ("585a8687ab41d5c29f86e5906c8f188ddca816b3", true)); // for sha1
+	BOOST_CHECK (output.is_equal ("39fefe65b3e1021776c07d3a9a3023c6c7cdf12724ee7f3a98b813b22f46d5ec", true)); // for sha256
 }
 
 BOOST_AUTO_TEST_SUITE_END()