commit 117f5ef083e6984d111ad8627272c4e25b99b300
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Jun 03 15:07:24 2015 -0700
committer Alex Afanasyev <alexander.afanasyev@ucla.edu> Wed Jun 10 18:50:38 2015 -0700
tree 1abe4710abe78503ad5e8e72763d280c079f9b89
parent aa8fd16f0a36596757e2b951d1ad0dd07faccc78

encoding: Remove SCOPE from Interests and all references to it in the related code

Change-Id: I2b19d0bb7ea5fdcea0da3996b946bb7797a9ea2d
Refs: #2345

tests/unit-tests/interest.t.cpp

diff --git a/tests/unit-tests/interest.t.cpp b/tests/unit-tests/interest.t.cpp
index 42be675..106fbf0 100644
--- a/tests/unit-tests/interest.t.cpp
+++ b/tests/unit-tests/interest.t.cpp
@@ -35,7 +35,7 @@
 BOOST_AUTO_TEST_SUITE(TestInterest)
 
 const uint8_t Interest1[] = {
-  0x05,  0x5c, // NDN Interest
+  0x05,  0x59, // NDN Interest
       0x07,  0x14, // Name
           0x08,  0x5, // NameComponent
               0x6c,  0x6f,  0x63,  0x61,  0x6c,
@@ -66,14 +66,12 @@
               0x1,
       0x0a,  0x4, // Nonce
           0x1, 0x0, 0x0, 0x00,
-      0x0b,  0x1, // Scope
-          0x1,
       0x0c,       // InterestLifetime
           0x2,  0x3,  0xe8
 };
 
 const uint8_t Interest2[] = {
-  0x05,  0x5c, // NDN Interest
+  0x05,  0x59, // NDN Interest
       0x07,  0x14, // Name
           0x08,  0x5, // NameComponent
               0x6c,  0x6f,  0x63,  0x61,  0x6c,
@@ -104,8 +102,6 @@
               0x1,
       0x0a,  0x4, // Nonce
           0x2, 0x0, 0x0, 0x00,
-      0x0b,  0x1, // Scope
-          0x1,
       0x0c,       // InterestLifetime
           0x2,  0x3,  0xe8
 };
@@ -515,7 +511,6 @@
   //                Name
   //                Selectors?
   //                Nonce
-  //                Scope?
   //                InterestLifetime?
   //                Link?
   //                SelectedDelegation?
@@ -561,15 +556,6 @@
   BOOST_CHECK_EQUAL(a == b, true);
   BOOST_CHECK_EQUAL(a != b, false);
 
-  // check comparison on Nonce
-  a.setScope(1);
-  BOOST_CHECK_EQUAL(a == b, false);
-  BOOST_CHECK_EQUAL(a != b, true);
-
-  b.setScope(1);
-  BOOST_CHECK_EQUAL(a == b, true);
-  BOOST_CHECK_EQUAL(a != b, false);
-
   // check comparison on InterestLifetime
   a.setInterestLifetime(time::seconds(10));
   BOOST_CHECK_EQUAL(a == b, false);
@@ -745,7 +731,6 @@
   a.setName("/Test/Encode/Decode/With/Link");
   a.setChildSelector(1);
   a.setNonce(100);
-  a.setScope(1);
   a.setInterestLifetime(time::seconds(10));
   a.setLink(wire);
 
@@ -861,7 +846,6 @@
   a.setName("/Test/Encode/Decode/With/Link");
   a.setChildSelector(1);
   a.setNonce(100);
-  a.setScope(1);
   a.setInterestLifetime(time::seconds(10));
   a.setLink(wire);
   BOOST_REQUIRE_THROW(a.setSelectedDelegation(3), Interest::Error);
@@ -878,7 +862,6 @@
   a.setName("/Test/Encode/Decode/With/Link");
   a.setChildSelector(1);
   a.setNonce(100);
-  a.setScope(1);
   a.setInterestLifetime(time::seconds(10));
   a.setLink(wire);
   BOOST_REQUIRE_THROW(a.setSelectedDelegation(4), Interest::Error);
@@ -892,7 +875,6 @@
   BOOST_REQUIRE_NO_THROW(i.wireDecode(interestBlock));
 
   BOOST_CHECK_EQUAL(i.getName().toUri(), "/local/ndn/prefix");
-  BOOST_CHECK_EQUAL(i.getScope(), 1);
   BOOST_CHECK_EQUAL(i.getInterestLifetime(), time::milliseconds(1000));
   BOOST_CHECK_EQUAL(i.getMinSuffixComponents(), 1);
   BOOST_CHECK_EQUAL(i.getMaxSuffixComponents(), 1);
@@ -916,7 +898,6 @@
   BOOST_REQUIRE_NO_THROW(i.wireDecode(interestBlock));
 
   BOOST_CHECK_EQUAL(i.getName().toUri(), "/local/ndn/prefix");
-  BOOST_CHECK_EQUAL(i.getScope(), 1);
   BOOST_CHECK_EQUAL(i.getInterestLifetime(), time::milliseconds(1000));
   BOOST_CHECK_EQUAL(i.getMinSuffixComponents(), 1);
   BOOST_CHECK_EQUAL(i.getMaxSuffixComponents(), 1);
@@ -929,7 +910,6 @@
 BOOST_AUTO_TEST_CASE(Encode)
 {
   ndn::Interest i(ndn::Name("/local/ndn/prefix"));
-  i.setScope(1);
   i.setInterestLifetime(time::milliseconds(1000));
   i.setMinSuffixComponents(1);
   i.setMaxSuffixComponents(1);
@@ -965,7 +945,7 @@
   BOOST_CHECK_EQUAL(strStream.str(),
                     "/local/ndn/prefix?"
                     "ndn.MinSuffixComponents=1&ndn.MaxSuffixComponents=1&"
-                    "ndn.ChildSelector=1&ndn.Scope=1&"
+                    "ndn.ChildSelector=1&"
                     "ndn.InterestLifetime=1000&"
                     "ndn.Nonce=2&ndn.Exclude=alex,xxxx,*,yyyy");