commit f0330d5fe61809032780c0780aa7eeb86e481a50
author Weiqi Shi <swqjustin@g.ucla.edu> Wed Jul 09 10:54:27 2014 -0700
committer justin <swqjustin@g.ucla.edu> Tue Jul 22 16:51:54 2014 -0700
tree 5904b862c0bc8fe384a667f8db9105ab2b8fbbc0
parent 28a90fbc7a4be6d609946d07db6cce5b54a8a134

storage: Making use of SkipList-based index

Change-Id: I360af97ae794da383fe00aaad8ab3c417c5167d3
Refs: #1695, #1434

tests/integrated/test-basic-interest-read.cpp

diff --git a/tests/integrated/test-basic-interest-read.cpp b/tests/integrated/test-basic-interest-read.cpp
index 0ab2346..c198871 100644
--- a/tests/integrated/test-basic-interest-read.cpp
+++ b/tests/integrated/test-basic-interest-read.cpp
@@ -18,10 +18,10 @@
  */
 
 #include "handles/read-handle.hpp"
-#include "storage/storage-handle.hpp"
-#include "storage/sqlite-handle.hpp"
+#include "storage/sqlite-storage.hpp"
+#include "storage/repo-storage.hpp"
 
-#include "../sqlite-fixture.hpp"
+#include "../repo-storage-fixture.hpp"
 #include "../dataset-fixtures.hpp"
 
 #include <ndn-cxx/util/random.hpp>
@@ -37,7 +37,7 @@
 const static uint8_t content[8] = {3, 1, 4, 1, 5, 9, 2, 6};
 
 template<class Dataset>
-class BasicInterestReadFixture : public SqliteFixture, public Dataset
+class BasicInterestReadFixture : public RepoStorageFixture, public Dataset
 {
 public:
   BasicInterestReadFixture()
@@ -71,7 +71,6 @@
       bool rc = handle->insertData(**i);
 
       BOOST_CHECK_EQUAL(rc, true);
-
       Interest readInterest((*i)->getName());
       readInterest.setMustBeFresh(true);
       scheduler.scheduleEvent(ndn::time::milliseconds(timeCount * 50),
@@ -92,8 +91,6 @@
   {
     int rc = memcmp(data.getContent().value(), content, sizeof(content));
     BOOST_CHECK_EQUAL(rc, 0);
-    //then delete the data
-    BOOST_CHECK_EQUAL(handle->deleteData(data.getName()), true);
   }
 
   void
@@ -122,19 +119,19 @@
 BOOST_FIXTURE_TEST_CASE_TEMPLATE(Read, T, DatasetFixtures, BasicInterestReadFixture<T>)
 {
   // Insert dataset
-  for (typename T::DataContainer::iterator i = this->data.begin();
-       i != this->data.end(); ++i) {
-    BOOST_CHECK_EQUAL(this->handle->insertData(**i), true);
-  }
+ // for (typename T::DataContainer::iterator i = this->data.begin();
+ //      i != this->data.end(); ++i) {
+ //   BOOST_CHECK_EQUAL(this->handle.insertData(**i), true);
+ // }
 
-  BOOST_CHECK_EQUAL(this->handle->size(), this->data.size());
+//  BOOST_CHECK_EQUAL(this->handle.size(), this->data.size());
 
   this->startListen();
   this->scheduler.scheduleEvent(ndn::time::seconds(0),
                                 ndn::bind(&BasicInterestReadFixture<T>::scheduleReadEvent, this));
 
   // schedule an event to terminate IO
-  this->scheduler.scheduleEvent(ndn::time::seconds(10),
+  this->scheduler.scheduleEvent(ndn::time::seconds(20),
                                 ndn::bind(&BasicInterestReadFixture<T>::stopFaceProcess, this));
   this->repoFace.getIoService().run();