SunnyQjm/ndn-tools
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: avoid deprecated Data::getSignature()

Browse Source 
Change-Id: Ica204fe6cd60f070b49f9ec5b72c0f68a32065d6
This commit is contained in:
Davide Pesavento committed 2020-07-27 18:02:03 -04:00
1 parent d653afaf01
commit 352755871f
3 files changed
+17 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.travis.yml
-3
View File
@@ -41,9 +41,6 @@ jobs:
- os: osx
osx_image: xcode11.3
env: # default compiler
- os: osx
osx_image: xcode11.4
env: # default compiler
- os: osx
osx_image: xcode11.6
env: # default compiler
tests/chunks/producer.t.cpp
+11 -16
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2016-2019, Regents of the University of California,
* Copyright (c) 2016-2020, Regents of the University of California,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University.
*
@@ -115,9 +115,8 @@ BOOST_AUTO_TEST_CASE(RequestSegmentUnspecifiedVersion)
auto lastData = face.sentData.back();
BOOST_REQUIRE_EQUAL(lastData.getName().size(), prefix.size() + 2);
BOOST_CHECK_EQUAL(lastData.getName()[-1].toSegment(), 0);
BOOST_REQUIRE(lastData.getFinalBlock());
BOOST_CHECK_EQUAL(lastData.getFinalBlock()->toSegment(), nSegments - 1);
BOOST_CHECK_EQUAL(lastData.getSignature().getKeyLocator().getName(), keyLocatorName);
BOOST_CHECK_EQUAL(lastData.getFinalBlock().value().toSegment(), nSegments - 1);
BOOST_CHECK_EQUAL(lastData.getKeyLocator().value().getName(), keyLocatorName);
// segment request
Name nameWithVersion(prefix);
@@ -131,9 +130,8 @@ BOOST_AUTO_TEST_CASE(RequestSegmentUnspecifiedVersion)
lastData = face.sentData.back();
BOOST_REQUIRE_EQUAL(lastData.getName().size(), prefix.size() + 2);
BOOST_CHECK_EQUAL(lastData.getName()[-1].toSegment(), requestSegmentNo);
BOOST_REQUIRE(lastData.getFinalBlock());
BOOST_CHECK_EQUAL(lastData.getFinalBlock()->toSegment(), nSegments - 1);
BOOST_CHECK_EQUAL(lastData.getSignature().getKeyLocator().getName(), keyLocatorName);
BOOST_CHECK_EQUAL(lastData.getFinalBlock().value().toSegment(), nSegments - 1);
BOOST_CHECK_EQUAL(lastData.getKeyLocator().value().getName(), keyLocatorName);
}
BOOST_AUTO_TEST_CASE(RequestSegmentSpecifiedVersion)
@@ -151,9 +149,8 @@ BOOST_AUTO_TEST_CASE(RequestSegmentSpecifiedVersion)
BOOST_REQUIRE_EQUAL(lastData.getName().size(), prefix.size() + 1);
BOOST_CHECK_EQUAL(lastData.getName()[-2].toVersion(), version);
BOOST_CHECK_EQUAL(lastData.getName()[-1].toSegment(), 0);
BOOST_REQUIRE(lastData.getFinalBlock());
BOOST_CHECK_EQUAL(lastData.getFinalBlock()->toSegment(), nSegments - 1);
BOOST_CHECK_EQUAL(lastData.getSignature().getKeyLocator().getName(), keyLocatorName);
BOOST_CHECK_EQUAL(lastData.getFinalBlock().value().toSegment(), nSegments - 1);
BOOST_CHECK_EQUAL(lastData.getKeyLocator().value().getName(), keyLocatorName);
// segment request
Name nameWithVersion(prefix);
@@ -167,9 +164,8 @@ BOOST_AUTO_TEST_CASE(RequestSegmentSpecifiedVersion)
BOOST_REQUIRE_EQUAL(lastData.getName().size(), prefix.size() + 1);
BOOST_CHECK_EQUAL(lastData.getName()[-2].toVersion(), version);
BOOST_CHECK_EQUAL(lastData.getName()[-1].toSegment(), requestSegmentNo);
BOOST_REQUIRE(lastData.getFinalBlock());
BOOST_CHECK_EQUAL(lastData.getFinalBlock()->toSegment(), nSegments - 1);
BOOST_CHECK_EQUAL(lastData.getSignature().getKeyLocator().getName(), keyLocatorName);
BOOST_CHECK_EQUAL(lastData.getFinalBlock().value().toSegment(), nSegments - 1);
BOOST_CHECK_EQUAL(lastData.getKeyLocator().value().getName(), keyLocatorName);
}
BOOST_AUTO_TEST_CASE(RequestNotExistingSegment)
@@ -186,9 +182,8 @@ BOOST_AUTO_TEST_CASE(RequestNotExistingSegment)
auto lastData = face.sentData.back();
BOOST_REQUIRE_EQUAL(lastData.getName().size(), prefix.size() + 2);
BOOST_CHECK_EQUAL(lastData.getName()[-1].toSegment(), 0);
BOOST_REQUIRE(lastData.getFinalBlock());
BOOST_CHECK_EQUAL(lastData.getFinalBlock()->toSegment(), nSegments - 1);
BOOST_CHECK_EQUAL(lastData.getSignature().getKeyLocator().getName(), keyLocatorName);
BOOST_CHECK_EQUAL(lastData.getFinalBlock().value().toSegment(), nSegments - 1);
BOOST_CHECK_EQUAL(lastData.getKeyLocator().value().getName(), keyLocatorName);
// segment request
Name nameWithVersion(prefix);
tests/peek/ndnpoke.t.cpp
+6 -6
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2019, Regents of the University of California,
* Copyright (c) 2014-2020, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE(Basic)
BOOST_CHECK_EQUAL(face.sentData.back().getFreshnessPeriod(), 0_ms);
BOOST_CHECK_EQUAL(face.sentData.back().getContentType(), tlv::ContentType_Blob);
BOOST_CHECK_EQUAL(face.sentData.back().getContent(), "150E48656C6C6F2C20776F726C64210A"_block);
BOOST_CHECK_EQUAL(face.sentData.back().getSignature().getType(), tlv::SignatureSha256WithEcdsa);
BOOST_CHECK_EQUAL(face.sentData.back().getSignatureType(), tlv::SignatureSha256WithEcdsa);
// Check for prefix unregistration
BOOST_REQUIRE_EQUAL(face.sentInterests.size(), 2); // One for registration, one for unregistration
@@ -135,7 +135,7 @@ BOOST_AUTO_TEST_CASE(FreshnessPeriod)
BOOST_CHECK_EQUAL(face.sentData.back().getName(), "/poke/test");
BOOST_CHECK(!face.sentData.back().getFinalBlock());
BOOST_CHECK_EQUAL(face.sentData.back().getFreshnessPeriod(), 1_s);
BOOST_CHECK_EQUAL(face.sentData.back().getSignature().getType(), tlv::SignatureSha256WithEcdsa);
BOOST_CHECK_EQUAL(face.sentData.back().getSignatureType(), tlv::SignatureSha256WithEcdsa);
}
BOOST_AUTO_TEST_CASE(FinalBlockId)
@@ -157,7 +157,7 @@ BOOST_AUTO_TEST_CASE(FinalBlockId)
BOOST_REQUIRE(face.sentData.back().getFinalBlock());
BOOST_CHECK_EQUAL(*(face.sentData.back().getFinalBlock()), name::Component("123"));
BOOST_CHECK_EQUAL(face.sentData.back().getFreshnessPeriod(), 0_ms);
BOOST_CHECK_EQUAL(face.sentData.back().getSignature().getType(), tlv::SignatureSha256WithEcdsa);
BOOST_CHECK_EQUAL(face.sentData.back().getSignatureType(), tlv::SignatureSha256WithEcdsa);
}
BOOST_AUTO_TEST_CASE(DigestSha256)
@@ -177,7 +177,7 @@ BOOST_AUTO_TEST_CASE(DigestSha256)
BOOST_CHECK_EQUAL(face.sentData.back().getName(), "/poke/test");
BOOST_CHECK(!face.sentData.back().getFinalBlock());
BOOST_CHECK_EQUAL(face.sentData.back().getFreshnessPeriod(), 0_ms);
BOOST_CHECK_EQUAL(face.sentData.back().getSignature().getType(), tlv::DigestSha256);
BOOST_CHECK_EQUAL(face.sentData.back().getSignatureType(), tlv::DigestSha256);
}
BOOST_AUTO_TEST_CASE(Unsolicited)
@@ -194,7 +194,7 @@ BOOST_AUTO_TEST_CASE(Unsolicited)
BOOST_CHECK_EQUAL(face.sentData.back().getName(), "/poke/test");
BOOST_CHECK(!face.sentData.back().getFinalBlock());
BOOST_CHECK_EQUAL(face.sentData.back().getFreshnessPeriod(), 0_ms);
BOOST_CHECK_EQUAL(face.sentData.back().getSignature().getType(), tlv::SignatureSha256WithEcdsa);
BOOST_CHECK_EQUAL(face.sentData.back().getSignatureType(), tlv::SignatureSha256WithEcdsa);
}
BOOST_AUTO_TEST_CASE(Timeout)